Merge branch 'dev/arfin' into 'ENV-DEPLOYMENT'

Dev/arfin

See merge request !1573

src/container/Authorization/User/EditUser.js

@@ -762,8 +762,8 @@ export default class EditUser extends Component {
                         </div>
                     </div>
                     <div style={{ flexDirection: 'column', display: 'flex', paddingLeft: 30, paddingRight: 30 }}>
-                        <Typography style={{ fontSize: 11 }}>{`Created By  : ${this.state.tempData === null ? '' : this.state.tempData.created}`}</Typography>
-                        <Typography style={{ fontSize: 11 }}>{`Updated By  : ${this.state.tempData === null ? '' : this.state.tempData.updated}`}</Typography>
+                        <Typography style={{ fontSize: 11 }}>{`Created By  : ${this.state.tempData === null ? '' : (this.state.tempData.created === null ? '-' : this.state.tempData.created)}`}</Typography>
+                        <Typography style={{ fontSize: 11 }}>{`Updated By  : ${this.state.tempData === null ? '' : (this.state.tempData.updated === null ? '-' : this.state.tempData.updated)}`}</Typography>
                     </div>
                     <Divider style={{ margin: 20 }} />
                     <div style={{ paddingLeft: 20, paddingRight: 20 }}>

src/container/DocumentManagement/DocumentManagement.js

@@ -258,7 +258,7 @@ export default class DocumentManagement extends Component {
                 {this.state.loading && loadingComponent}
                     <Paper style={{ padding: 20 }}>
                         <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-                        {(this.state.btncreate) && <span>
+                        {(this.state.btncreate || this.state.btnadd) && <span>
                             <a data-tip={'Add'} data-for="add">
                                 <div style={{ display: 'grid', justifyContent: 'flex-end' }}>
                                     <button