Commit 25105f54 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

update loading di RO TP

See merge request !1566
parents 49015a4a 5320a2d2
...@@ -6236,6 +6236,7 @@ export default class TaxPlanning extends Component { ...@@ -6236,6 +6236,7 @@ export default class TaxPlanning extends Component {
{this.state.dataLoaded && ( {this.state.dataLoaded && (
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}> <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{this.state.loading && loadingComponent} {this.state.loading && loadingComponent}
{!this.state.loading &&
<MuiThemeProvider theme={getMuiTheme()}> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={dataTable2} data={dataTable2}
...@@ -6243,6 +6244,7 @@ export default class TaxPlanning extends Component { ...@@ -6243,6 +6244,7 @@ export default class TaxPlanning extends Component {
options={options} options={options}
/> />
</MuiThemeProvider> </MuiThemeProvider>
}
</div> </div>
)} )}
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment