Commit baa09108 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

taxplan mr issue demo loading

See merge request !1446
parents 41a0b12f c5aecc2b
...@@ -1580,13 +1580,13 @@ export default class TaxPlanningMR extends Component { ...@@ -1580,13 +1580,13 @@ export default class TaxPlanningMR extends Component {
<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}
<MuiThemeProvider theme={getMuiTheme()}> {!this.state.loading && <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={dataTable2} data={dataTable2}
columns={columns} columns={columns}
options={options} options={options}
/> />
</MuiThemeProvider> </MuiThemeProvider>}
{/* )} */} {/* )} */}
</div> </div>
<div style={{display: 'flex'}}> <div style={{display: 'flex'}}>
......
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