fix: MUSD-400 fixed spam clicks on bottom sheet component causing it to navigate back

app/component-library/components/BottomSheets/BottomSheet/BottomSheet.tsx

@@ -73,7 +73,13 @@ const BottomSheet = forwardRef<BottomSheetRef, BottomSheetProps>(
     const onCloseCB = useCallback(() => {
       if (shouldNavigateBack && !didNavigateBackRef.current) {
         didNavigateBackRef.current = true;
-        navigation.goBack();
+        if (navigation.isFocused()) {
+          navigation.goBack();
+        } else {
+          Logger.log(
+            '[BottomSheet] navigation.goBack skipped (screen not focused)',
+          );
+        }
       } else if (shouldNavigateBack && didNavigateBackRef.current) {
         Logger.log('[BottomSheet] navigation.goBack skipped (duplicate close)');
       }
@@ -92,14 +98,17 @@ const BottomSheet = forwardRef<BottomSheetRef, BottomSheetProps>(
     // Dismiss the sheet when Android back button is pressed.
     useEffect(() => {
       const hardwareBackPress = () => {
+        if (!navigation.isFocused()) {
+          return false;
+        }
         isInteractable && bottomSheetDialogRef.current?.onCloseDialog();
         return true;
       };
       BackHandler.addEventListener('hardwareBackPress', hardwareBackPress);
       return () => {
         BackHandler.removeEventListener('hardwareBackPress', hardwareBackPress);
       };
-    }, [onCloseCB, isInteractable]);
+    }, [onCloseCB, isInteractable, navigation]);
 
     useImperativeHandle(ref, () => ({
       onCloseBottomSheet: (callback) => {

app/components/UI/BasicFunctionality/BasicFunctionalityModal/BasicFunctionalityModal.test.js

@@ -55,6 +55,7 @@ jest.mock('@react-navigation/native', () => {
       dangerouslyGetParent: () => ({
         pop: jest.fn(),
       }),
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/UI/Card/components/AddFundsBottomSheet/AddFundsBottomSheet.test.tsx

@@ -91,6 +91,7 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: () => ({
     goBack: mockGoBack,
     navigate: mockNavigate,
+    isFocused: jest.fn(() => true),
   }),
 }));
 

app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.test.tsx

@@ -17,6 +17,7 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: () => ({
     navigate: mockNavigate,
     goBack: mockGoBack,
+    isFocused: () => true,
   }),
 }));
 

app/components/UI/DeepLinkModal/DeepLinkModal.test.tsx

@@ -95,6 +95,7 @@ const mockGoBack = jest.fn();
 (useNavigation as jest.Mock).mockReturnValue({
   navigate: mockNavigate,
   goBack: mockGoBack,
+  isFocused: jest.fn(() => true),
 } as never);
 
 describe('DeepLinkModal', () => {

app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx

@@ -93,6 +93,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockNavigate,
       goBack: mockGoBack,
+      isFocused: jest.fn(() => true),
     }),
     useRoute: () => ({
       params: {

app/components/UI/Earn/components/MaxInputModal/MaxInputModal.test.tsx

@@ -23,6 +23,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockNavigate,
       goBack: mockGoBack,
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/UI/Identity/ConfirmTurnOnBackupAndSyncModal/ConfirmTurnOnBackupAndSyncModal.test.tsx

@@ -63,6 +63,7 @@ jest.mock('@react-navigation/native', () => {
       dangerouslyGetParent: () => ({
         pop: jest.fn(),
       }),
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/UI/Ramp/Aggregator/Views/Checkout/Checkout.test.tsx

@@ -32,6 +32,7 @@ const mockNavigation = {
   goBack: jest.fn(),
   setOptions: mockSetOptions,
   dangerouslyGetParent: () => ({ pop: mockPop }),
+  isFocused: jest.fn(() => true),
 };
 jest.mock('@react-navigation/native', () => ({
   ...jest.requireActual('@react-navigation/native'),

app/components/UI/Ramp/Aggregator/Views/Quotes/Quotes.test.tsx

@@ -69,6 +69,7 @@ jest.mock('@react-navigation/native', () => {
       goBack: mockGoBack,
       reset: mockReset,
       pop: mockPop,
+      isFocused: () => true,
       dangerouslyGetParent: () => ({
         pop: mockPop,
       }),

app/components/UI/Ramp/Deposit/Views/Modals/StateSelectorModal/StateSelectorModal.test.tsx

@@ -63,6 +63,7 @@ jest.mock('@react-navigation/native', () => {
       navigate: mockNavigate,
       goBack: mockGoBack,
       dangerouslyGetParent: mockDangerouslyGetParent,
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/UI/Ramp/Deposit/Views/Modals/UnsupportedRegionModal/UnsupportedRegionModal.test.tsx

@@ -23,6 +23,7 @@ jest.mock('@react-navigation/native', () => {
       navigate: mockNavigate,
       goBack: mockGoBack,
       dangerouslyGetParent: mockDangerouslyGetParent,
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/UI/Ramp/Deposit/Views/Modals/UnsupportedStateModal/UnsupportedStateModal.test.tsx

@@ -40,6 +40,7 @@ jest.mock('@react-navigation/native', () => {
       goBack: mockGoBack,
       navigate: mockNavigate,
       dangerouslyGetParent: mockDangerouslyGetParent,
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/UI/Stake/components/GasImpactModal/GasImpactModal.test.tsx

@@ -112,6 +112,7 @@ describe('GasImpactModal', () => {
     useNavigationMock.mockReturnValue({
       navigate: mockNavigate,
       goBack: mockGoBack,
+      isFocused: jest.fn(() => true),
     } as unknown as ReturnType<typeof useNavigation>);
   });
 

app/components/UI/Tokens/TokenSortBottomSheet/TokenSortBottomSheet.test.tsx

@@ -30,6 +30,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: jest.fn(),
       goBack: jest.fn(),
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/Views/AccountActions/AccountActions.test.tsx

@@ -218,6 +218,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockNavigate,
       goBack: mockGoBack,
+      isFocused: jest.fn(() => true),
     }),
     useRoute: jest.fn(),
   };

app/components/Views/AccountConnect/AccountConnect.test.tsx

@@ -77,6 +77,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
       goBack: mockedGoBack,
+      isFocused: () => true,
     }),
   };
 });

app/components/Views/AccountConnect/__snapshots__/AccountConnect.test.tsx.snap

@@ -505,6 +505,7 @@ exports[`AccountConnect renders correctly when merging existing CAIP-25 permissi
                 navigation={
                   {
                     "goBack": [MockFunction],
+                    "isFocused": [Function],
                     "navigate": [MockFunction],
                   }
                 }
@@ -1571,6 +1572,7 @@ exports[`AccountConnect renders correctly with base request when there is no exi
                 navigation={
                   {
                     "goBack": [MockFunction],
+                    "isFocused": [Function],
                     "navigate": [MockFunction],
                   }
                 }
@@ -2637,6 +2639,7 @@ exports[`AccountConnect renders correctly with request including chains and acco
                 navigation={
                   {
                     "goBack": [MockFunction],
+                    "isFocused": [Function],
                     "navigate": [MockFunction],
                   }
                 }
@@ -3703,6 +3706,7 @@ exports[`AccountConnect renders correctly with request including only chains 1`]
                 navigation={
                   {
                     "goBack": [MockFunction],
+                    "isFocused": [Function],
                     "navigate": [MockFunction],
                   }
                 }

app/components/Views/AccountPermissions/AccountPermissionsConfirmRevokeAll/AccountPermissionsConfirmRevokeAll.test.tsx

@@ -18,6 +18,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
       goBack: mockedGoBack,
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/Views/AccountSelector/AccountSelector.test.tsx

@@ -101,6 +101,7 @@ jest.mock('@react-navigation/native', () => ({
     goBack: mockGoBack,
     navigate: mockNavigate,
     dispatch: jest.fn(),
+    isFocused: jest.fn(() => true),
   }),
 }));
 

app/components/Views/AssetOptions/AssetOptions.test.tsx

@@ -232,6 +232,7 @@ describe('AssetOptions Component', () => {
   const mockNavigation = {
     navigate: jest.fn(),
     goBack: jest.fn(),
+    isFocused: jest.fn().mockReturnValue(true),
   };
 
   beforeEach(() => {

app/components/Views/Pna25BottomSheet/Pna25BottomSheet.test.tsx

@@ -27,6 +27,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockNavigate,
       goBack: mockGoBack,
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/Views/Settings/AdvancedSettings/FiatOnTestnetsFriction/FiatOnTestnetsFriction.test.tsx

@@ -20,6 +20,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockNavigate,
       goBack: mockGoBack,
+      isFocused: jest.fn(() => true),
     }),
   };
 });

app/components/Views/WalletActions/WalletActions.test.tsx

@@ -259,6 +259,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockNavigate,
       goBack: mockGoBack,
+      isFocused: jest.fn(() => true),
     }),
   };
 });