fix: go back behavior on wallet connect session deny

desmos-labs · Mar 14, 2024 · 8d758d5 · 8d758d5
1 parent 0bf7b0a
commit 8d758d5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/src/hooks/uriactions/useHandleUriAction.tsx b/src/hooks/uriactions/useHandleUriAction.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {
-  GenericActionUri,
   GenericActionsTypes,
+  GenericActionUri,
   SendTokensActionUri,
   UriAction,
   UriActionType,
@@ -121,7 +121,7 @@ const useHandleWalletConnectPairAction = () => {
         text: t('initializing new session'),
       });
       const pairResult = await pair(action.uri);
-      hideModal();
+      hideModal(true);
       if (pairResult.isErr()) {
         showModal(ErrorModal, {
           text: pairResult.error.message,

diff --git a/src/hooks/useReturnToCurrentScreen.ts b/src/hooks/useReturnToCurrentScreen.ts
@@ -36,15 +36,20 @@ const useReturnToCurrentScreen = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  return useCallback(() => {
-    const canNavigate =
-      startingScreenNavigateParams !== undefined &&
-      navigator.getState().routes.find((r) => r.key === startingScreenNavigateParams.key) !==
-        undefined;
-    if (canNavigate) {
-      navigator.navigate(startingScreenNavigateParams);
-    }
-  }, [navigator, startingScreenNavigateParams]);
+  return useCallback(
+    (fallbackToGoBack?: boolean) => {
+      const canNavigate =
+        startingScreenNavigateParams !== undefined &&
+        navigator.getState().routes.find((r) => r.key === startingScreenNavigateParams.key) !==
+          undefined;
+      if (canNavigate) {
+        navigator.navigate(startingScreenNavigateParams);
+      } else if (fallbackToGoBack) {
+        navigator.goBack();
+      }
+    },
+    [navigator, startingScreenNavigateParams],
+  );
 };
 
 export default useReturnToCurrentScreen;
diff --git a/src/screens/WalletConnectSessionProposal/index.tsx b/src/screens/WalletConnectSessionProposal/index.tsx
@@ -17,6 +17,7 @@ import { DPMImages } from 'types/images';
 import { walletConnectIconUriToImageSource } from 'lib/WalletConnectUtils';
 import FastImage from 'react-native-fast-image';
 import useResetToHomeScreen from 'hooks/navigation/useResetToHomeScreen';
+import useOnBackAction from 'hooks/useOnBackAction';
 import useStyles from './useStyles';
 
 export interface WalletConnectSessionProposalParams {
@@ -79,16 +80,20 @@ const WalletConnectSessionProposal: FC<NavProps> = (props) => {
     [openModal, t],
   );
 
-  const onDeny = useCallback(async () => {
-    setRejecting(true);
-    const rejectResult = await rejectSession(proposal);
-    if (rejectResult.isOk()) {
-      navigation.goBack();
-    } else {
-      showErrorModal(rejectResult.error.message);
-    }
-    setRejecting(false);
-  }, [navigation, proposal, rejectSession, showErrorModal]);
+  const onDeny = useCallback(
+    async (noNavigation?: boolean) => {
+      setRejecting(true);
+      await rejectSession(proposal);
+      if (noNavigation !== true) {
+        navigation.goBack();
+      }
+      setRejecting(false);
+    },
+    [navigation, proposal, rejectSession],
+  );
+  useOnBackAction(() => {
+    onDeny(true);
+  }, [onDeny]);
 
   const onGrant = useCallback(async () => {
     setAuthorizing(true);
@@ -128,7 +133,7 @@ const WalletConnectSessionProposal: FC<NavProps> = (props) => {
       <Button
         style={styles.denyButton}
         mode="contained"
-        onPress={onDeny}
+        onPress={() => onDeny()}
         accent
         loading={rejecting}
         disabled={authorizing || rejecting}