Merge remote-tracking branch 'origin/master'

packages/cpt_uk/lib/modules/job/job_applied_staff_detail/certification_dialog_widget.dart

@@ -129,7 +129,7 @@ class _certificationDialogState extends State<certificationDialog> {
                                   )
                                 ]
                             ],
-                          )
+                          ).expanded(),
                         ],
                       ),
                       SizedBox.fromSize(size: Size(0, 10)),

packages/cpt_uk/lib/modules/job/job_applied_staff_detail/staff_detail_widget.dart

@@ -316,7 +316,7 @@ class StaffDetailWidget extends StatelessWidget {
     return Row(
       children: [
           Flexible(
-            flex: 1,
+            flex: 2,
             child: MyTextView(
               '${certificateItem.type!}:',
               textColor: ColorConstants.textGrayAECAE5,
@@ -325,17 +325,18 @@ class StaffDetailWidget extends StatelessWidget {
             ),
           ),
           Flexible(
-            flex: 2,
+            flex: 1,
             child: MyTextView(
               certificateItem.status?? "",
               textColor: _getStatusColor(certificateItem.statusColor?? ''),
               fontSize: 14,
               isFontRegular: true,
               marginLeft: 5,
+              onClick: (){
+                onScanCertificateAction?.call(context, certificateItem);
+              },
             ),
-          ).onTap((){
-            onScanCertificateAction?.call(context, certificateItem);
-          }),
+          ),
       ]
     ).marginOnly(left: 22, right: 22,top: 10);
   }