Merge branch 'rifka' into 'master'

taxplan mr issue demo loading

See merge request !1446

src/container/MonthlyReport/TaxPlanningMR.js

@@ -1580,13 +1580,13 @@ export default class TaxPlanningMR extends Component {
 
                                 <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
                                     {this.state.loading && loadingComponent}
-                                        <MuiThemeProvider theme={getMuiTheme()}>
+                                        {!this.state.loading && <MuiThemeProvider theme={getMuiTheme()}>
                                             <MUIDataTable
                                                 data={dataTable2}
                                                 columns={columns}
                                                 options={options}
                                             />
-                                        </MuiThemeProvider>
+                                        </MuiThemeProvider>}
                                     {/* )} */}
                                 </div>
                                 <div style={{display: 'flex'}}>