Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Env dev

See merge request !2403

src/container/MonthlyReport/MonthlyReport.js

@@ -2612,6 +2612,8 @@ export default class MonthlyReport extends Component {
             lastStatusCat,
             submitter,
             submitterCAT,
+            pic,
+            picCAT,
             listAttachment,
             listAttachmentCAT
         } = this.state;
@@ -2619,8 +2621,8 @@ export default class MonthlyReport extends Component {
         const key = tableKeyParam ?? tableKey;
 
         return key === 2
-            ? { btnApprove: btnApproveCAT, lastStatus: lastStatusCat, submitter: submitterCAT, listAttachment: listAttachmentCAT }
-            : { btnApprove, lastStatus, submitter, listAttachment };
+            ? { btnApprove: btnApproveCAT, lastStatus: lastStatusCat, submitter: submitterCAT, pic: picCAT, listAttachment: listAttachmentCAT }
+            : { btnApprove, lastStatus, submitter, pic, listAttachment };
     };
 
     renderFilter = () => {
@@ -3412,7 +3414,7 @@ export default class MonthlyReport extends Component {
         );
 
         const mstIdFinance = this.state?.rowDataFinance?.length > 0 && this.state.rowDataFinance[0]?.master_report_type_id
-        const mstIdCAT = this.state?.rowDataCAT?.length > 0 && this.state.rowDataCAT[0]?.master_report_type_ids
+        const mstIdCAT = this.state?.rowDataCAT?.length > 0 && this.state.rowDataCAT[0]?.master_report_type_id
         return (
             <div style={{ flex: 1, backgroundColor: '#f8f8f8', overflow: 'scroll' }}>
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
@@ -3521,8 +3523,8 @@ export default class MonthlyReport extends Component {
                                             options={options}
                                         />
                                     </MuiThemeProvider>
-                                    {this.renderAttachment(mstIdFinance)}
-                                    {this.renderApproveMB(mstIdFinance)}
+                                    {this.renderAttachment(mstIdCAT)}
+                                    {this.renderApproveMB(mstIdCAT)}
                                     {this.renderHistoryInfo(mstIdCAT)}
                                     {this.state.visibleTableHistoryCAT && (
                                         <div style={{ marginTop: 20 }}>