Merge branch 'rifka' into 'master'

update loading di RO TP

See merge request !1566

src/container/RollingOutlook/TaxPlanningRO.js

@@ -6236,6 +6236,7 @@ export default class TaxPlanning extends Component {
                                     {this.state.dataLoaded && (
                                         <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
                                             {this.state.loading && loadingComponent}
+                                            {!this.state.loading &&
                                             <MuiThemeProvider theme={getMuiTheme()}>
                                                 <MUIDataTable
                                                     data={dataTable2}
@@ -6243,6 +6244,7 @@ export default class TaxPlanning extends Component {
                                                     options={options}
                                                 />
                                             </MuiThemeProvider>
+                                            }
                                         </div>
                                     )}
                                 </div>