[FIX] Wallet connect signed typed and eth sign throwing error back to…

… the dapp (#5103) * Wallet connect signed typed and eth sign throwing error back to the dapp * fix code to git ts notation * eth sign error moved to a constant and refactor logic on typed sign to the try catch * remove duplicated import
MetaMask · Nov 23, 2022 · 1c0ebb4 · 1c0ebb4
1 parent 08a5c4e
commit 1c0ebb4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/app/components/UI/TypedSign/index.js b/app/components/UI/TypedSign/index.js
@@ -114,9 +114,17 @@ class TypedSign extends PureComponent {
     );
   };
 
+  walletConnectNotificationTitle = (confirmation, isError) => {
+    if (isError) return strings('notifications.wc_signed_failed_title');
+    return confirmation
+      ? strings('notifications.wc_signed_title')
+      : strings('notifications.wc_signed_rejected_title');
+  };
+
   showWalletConnectNotification = (
     messageParams = {},
     confirmation = false,
+    isError = false,
   ) => {
     InteractionManager.runAfterInteractions(() => {
       messageParams.origin &&
@@ -125,9 +133,7 @@ class TypedSign extends PureComponent {
         NotificationManager.showSimpleNotification({
           status: `simple_notification${!confirmation ? '_rejected' : ''}`,
           duration: 5000,
-          title: confirmation
-            ? strings('notifications.wc_signed_title')
-            : strings('notifications.wc_signed_rejected_title'),
+          title: this.walletConnectNotificationTitle(confirmation, isError),
           description: strings('notifications.wc_description'),
         });
     });
@@ -138,15 +144,22 @@ class TypedSign extends PureComponent {
     const { KeyringController, TypedMessageManager } = Engine.context;
     const messageId = messageParams.metamaskId;
     const version = messageParams.version;
-    const cleanMessageParams = await TypedMessageManager.approveMessage(
-      messageParams,
-    );
-    const rawSig = await KeyringController.signTypedMessage(
-      cleanMessageParams,
-      version,
-    );
-    TypedMessageManager.setMessageStatusSigned(messageId, rawSig);
-    this.showWalletConnectNotification(messageParams, true);
+    let rawSig;
+    let cleanMessageParams;
+    try {
+      cleanMessageParams = await TypedMessageManager.approveMessage(
+        messageParams,
+      );
+      rawSig = await KeyringController.signTypedMessage(
+        cleanMessageParams,
+        version,
+      );
+      TypedMessageManager.setMessageStatusSigned(messageId, rawSig);
+      this.showWalletConnectNotification(messageParams, true);
+    } catch (error) {
+      TypedMessageManager.setMessageStatusSigned(messageId, error.message);
+      this.showWalletConnectNotification(messageParams, false, true);
+    }
   };
 
   rejectMessage = () => {

diff --git a/app/core/AppConstants.js b/app/core/AppConstants.js
@@ -143,4 +143,5 @@ export default {
   },
   CANCEL_RATE: 'Transactions (Cancel)',
   SPEED_UP_RATE: 'Transactions (Speed Up)',
+  ETH_SIGN_ERROR: 'eth_sign requires 32 byte message hash',
 };
diff --git a/app/core/RPCMethods/RPCMethodMiddleware.ts b/app/core/RPCMethods/RPCMethodMiddleware.ts
@@ -329,9 +329,8 @@ export const getRpcMethodMiddleware = ({
 
           res.result = rawSig;
         } else {
-          throw ethErrors.rpc.invalidParams(
-            'eth_sign requires 32 byte message hash',
-          );
+          res.result = AppConstants.ETH_SIGN_ERROR;
+          throw ethErrors.rpc.invalidParams(AppConstants.ETH_SIGN_ERROR);
         }
       },
 

diff --git a/locales/languages/en.json b/locales/languages/en.json
@@ -1480,6 +1480,7 @@
     "wc_sent_tx_title": "Sent transaction",
     "wc_connected_rejected_title": "You've rejected the connect request",
     "wc_signed_rejected_title": "You've rejected the sign request",
+    "wc_signed_failed_title": "This sign request failed",
     "wc_sent_tx_rejected_title": "You've rejected the transaction request",
     "wc_description": "Please check the application"
   },