@everymatrix/cashier-method-details 1.28.5 → 1.28.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/cashier-method-details",
-  "version": "1.28.5",
+  "version": "1.28.6",
   "main": "index.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a79b46ea6029e0c4cfe17ebfabd15cec443fc85f"
+  "gitHead": "1962d52e7f4ec718d6318e592deea4b535abde4a"
 }

package/src/CashierMethodDetails.svelte

@@ -452,6 +452,7 @@
       if (data.ResponseCode !== 'Success') {
         errorResponseCode = data.ResponseCode
         isProcessingTxn = false;
+        toggleDisableActionOnPage();
         showModal()
         return;
       }
@@ -638,9 +639,27 @@
     }
     return ''
   }
+  
+  const patternValidator = (pattern, value) => {
+    if (!pattern) return true;
+    let regex;
+    let regexStr;
+    if (typeof pattern === 'string') {
+      regexStr = '';
+      if (pattern.charAt(0) !== '^') regexStr += '^';
+      regexStr += pattern;
+      if (pattern.charAt(pattern.length - 1) !== '$') regexStr += '$';
+      regex = new RegExp(regexStr);
+    }
+    else {
+      regexStr = pattern.toString();
+      regex = pattern;
+    }
+    return regex.test(value);
+  }
 
   const patternMatchesError = (field, value):string => {
-    if (field.format && value && !value.toString().match(field.format)) {
+    if (field.format && value && !patternValidator(field.format, value)) {
       return $_('invalidFieldError',{ values: { field: field.label }})
     }
     return ''
@@ -685,7 +704,7 @@
                 <img src={selectedPaymentMethod.Logos[0] && selectedPaymentMethod.Logos[0].LogoUrl} alt={selectedPaymentMethod.Label} />
               </div>
               <div class="SelectedLogoDescription">
-                {selectedPaymentMethod.Label}
+                {selectedPaymentMethod.Label || selectedPaymentMethod.Name}
               </div>
               {#if mobileView}
                 <div on:click={() => backToMethodList()} class="ChangePaymeth">{$_('change')}</div>