Merge pull request #198 from multiversx/development

Fix missing safari consentPopups
multiversx · Mar 28, 2024 · 6e073ce · 6e073ce
2 parents 57408c7 + 8af24fe
commit 6e073ce
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/src/helpers/signAndSendTransactions.ts b/src/helpers/signAndSendTransactions.ts
@@ -1,15 +1,14 @@
 import { Transaction, TransactionsDisplayInfoType } from 'types';
 
 import { refreshAccount, sendTransactions } from './sdkDappHelpers';
+import { isSafari } from 'localConstants';
 
 type SignAndSendTransactionsProps = {
   transactions: Transaction[];
   callbackRoute: string;
   transactionsDisplayInfo: TransactionsDisplayInfoType;
 };
 
-const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-
 export const signAndSendTransactions = async ({
   transactions,
   callbackRoute,

diff --git a/src/localConstants/session/index.ts b/src/localConstants/session/index.ts
@@ -1 +1,5 @@
 export * from './session.enums';
+
+export const isSafari = /^((?!chrome|android).)*safari/i.test(
+  navigator.userAgent
+);
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendBatchTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendBatchTransactions.ts
@@ -1,6 +1,6 @@
 import { getBatchTransactions } from '../helpers';
 import { sendTransactions } from 'helpers/sdkDappHelpers';
-import { SessionEnum } from 'localConstants/session';
+import { SessionEnum, isSafari } from 'localConstants/session';
 import { SendTransactionProps } from '../types';
 
 export const sendBatchTransactions = async ({
@@ -19,7 +19,8 @@ export const sendBatchTransactions = async ({
     transactions,
     signWithoutSending: true,
     customTransactionInformation: { redirectAfterSign: true },
-    callbackRoute
+    callbackRoute,
+    hasConsentPopup: isSafari
   });
 
   if (error) {

diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/signAndAutoSendBatchTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/signAndAutoSendBatchTransactions.ts
@@ -1,4 +1,4 @@
-import { SessionEnum } from 'localConstants/session';
+import { SessionEnum, isSafari } from 'localConstants/session';
 import { getBatchTransactions } from '../helpers';
 import { refreshAccount } from 'utils/sdkDappUtils';
 import { sendBatchTransactions } from 'services/sdkDappServices';
@@ -34,7 +34,8 @@ export const signAndAutoSendBatchTransactions = async ({
       errorMessage: 'An error has occurred during transaction execution',
       successMessage: 'Batch transactions successful'
     },
-    callbackRoute
+    callbackRoute,
+    hasConsentPopup: isSafari
   });
   if (error) {
     console.error('Could not execute transactions', error);

diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/swapAndLockTokens.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/swapAndLockTokens.ts
@@ -1,4 +1,4 @@
-import { SessionEnum } from 'localConstants/session';
+import { SessionEnum, isSafari } from 'localConstants/session';
 import { getSwapAndLockTransactions } from '../helpers';
 import { sendBatchTransactions } from 'services/sdkDappServices';
 import { refreshAccount } from 'utils/sdkDappUtils';
@@ -32,7 +32,8 @@ export const swapAndLockTokens = async ({
       errorMessage: 'An error has occurred during transaction execution',
       successMessage: 'Batch transactions successful'
     },
-    callbackRoute
+    callbackRoute,
+    hasConsentPopup: isSafari
   });
 
   if (error) {