Wallet connect fix

Signed-off-by: Akintayo A. Olusegun <[email protected]>
MetaMask · Nov 14, 2023 · 8f8363e · 8f8363e
1 parent 88c4183
commit 8f8363e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 23 deletions.
diff --git a/app/components/Views/QRScanner/index.tsx b/app/components/Views/QRScanner/index.tsx
@@ -125,6 +125,7 @@ const QRScanner = () => {
       if (
         origin === Routes.SEND_FLOW.SEND_TO ||
         origin === Routes.SETTINGS.CONTACT_FORM
+        // origin === Routes.WALLET_VIEW
       ) {
         if (!isValidAddressInputViaQRCode(content)) {
           showAlertForInvalidAddress();

diff --git a/app/core/WalletConnect/WalletConnect.js b/app/core/WalletConnect/WalletConnect.js
@@ -26,6 +26,7 @@ import URL from 'url-parse';
 import parseWalletConnectUri from './wc-utils';
 import { store } from '../../store';
 import { selectChainId } from '../../selectors/networkController';
+import ppomUtil from '../../../app/lib/ppom/ppom-util';
 
 const hub = new EventEmitter();
 let connectors = [];
@@ -180,14 +181,32 @@ class WalletConnect {
                 hostname: payloadHostname,
               });
 
-              const hash = await (
-                await TransactionController.addTransaction(payload.params[0], {
+              const trx = await TransactionController.addTransaction(
+                payload.params[0],
+                {
                   deviceConfirmedOn: WalletDevice.MM_MOBILE,
                   origin: this.url.current
                     ? WALLET_CONNECT_ORIGIN + this.url.current
                     : undefined,
-                })
-              ).result;
+                },
+              );
+
+              const id = trx.transactionMeta.id;
+              const reqObject = {
+                jsonrpc: '2.0',
+                method: 'eth_sendTransaction',
+                params: [
+                  {
+                    from: payload.params[0].from,
+                    to: payload.params[0].to,
+                    value: payload.params[0].value,
+                  },
+                ],
+              };
+
+              ppomUtil.validateRequest(reqObject, id);
+
+              const hash = await trx.result;
               this.approveRequest({
                 id: payload.id,
                 result: hash,

diff --git a/app/core/WalletConnect/WalletConnectV2.ts b/app/core/WalletConnect/WalletConnectV2.ts
@@ -35,7 +35,6 @@ import parseWalletConnectUri, {
 import { selectChainId } from '../../selectors/networkController';
 import { store } from '../../store';
 import { WALLET_CONNECT_ORIGIN } from '../../../app/util/walletconnect';
-import { isBlockaidFeatureEnabled } from '../../../app/util/blockaid';
 import ppomUtil from '../../../app/lib/ppom/ppom-util';
 
 const { PROJECT_ID } = AppConstants.WALLET_CONNECT;
@@ -286,31 +285,30 @@ class WalletConnect2Session {
           Engine.context as { TransactionController: TransactionController }
         ).TransactionController;
 
-        let securityAlertResponse;
-
-        if (isBlockaidFeatureEnabled()) {
-          const reqObject = {
-            jsonrpc: '2.0',
-            method: 'eth_sendTransaction',
-            params: [
-              {
-                from: methodParams[0].from,
-                to: methodParams[0].to,
-                value: methodParams[0].value,
-              },
-            ],
-          };
-          securityAlertResponse = await ppomUtil.validateRequest(reqObject);
-        }
-
         const trx = await transactionController.addTransaction(
           methodParams[0],
           {
             origin,
             deviceConfirmedOn: WalletDevice.MM_MOBILE,
-            securityAlertResponse,
+            securityAlertResponse: undefined,
           },
         );
+
+        const id = trx.transactionMeta.id;
+        const reqObject = {
+          jsonrpc: '2.0',
+          method: 'eth_sendTransaction',
+          params: [
+            {
+              from: methodParams[0].from,
+              to: methodParams[0].to,
+              value: methodParams[0].value,
+            },
+          ],
+        };
+
+        ppomUtil.validateRequest(reqObject, id);
+
         const hash = await trx.result;
 
         await this.approveRequest({ id: requestEvent.id + '', result: hash });