Merge branch 'faisal' into 'master'

refresh upload

See merge request !962

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -1466,7 +1466,7 @@ export default class FixedAssetsMovementMR extends Component {
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                 </div>
                                 <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
-                                    {!this.state.loading && (
+                                    {!this.state.refresh && (
                                         <MuiThemeProvider theme={getMuiTheme()}>
                                             <MUIDataTable
                                                 data={dataTable2}