Merge pull request #999 from ambrosus/dev

Merge 'dev' into 'stage'

Author: EvgeniyJB

src/appTypes/navigation/root.ts

@@ -14,6 +14,7 @@ export type RootStackParamsList = {
   Passcode: PasscodeParams | undefined;
   BarcodeScannerScreen: {
     onScanned: (data: string) => void;
+    walletConnectEnabled?: boolean;
   };
 };
 

src/features/wallet-assets/lib/hooks/use-barcode.ts

@@ -104,7 +104,8 @@ export function useBarcode() {
   const onShowBarcodeContainer = useCallback(
     () =>
       navigation.navigate('BarcodeScannerScreen', {
-        onScanned: onScannedAddress
+        onScanned: onScannedAddress,
+        walletConnectEnabled: true
       }),
     [navigation, onScannedAddress]
   );

src/features/wallet-connect/components/composite/wallet-approval-view/index.tsx

@@ -32,8 +32,12 @@ import { styles } from './styles';
 export const WalletConnectApprovalView = () => {
   const { t } = useTranslation();
   const { wallet } = useWalletStore();
-  const { proposal, setActiveSessions, setWalletConnectStep } =
-    useWalletConnectContextSelector();
+  const {
+    proposal,
+    setActiveSessions,
+    walletConnectStep,
+    setWalletConnectStep
+  } = useWalletConnectContextSelector();
   const { onDismissWalletConnectBottomSheet } = useHandleBottomSheetActions();
 
   const [isLoadingApprove, setIsLoadingApprove] = useState(false);
@@ -115,6 +119,10 @@ export const WalletConnectApprovalView = () => {
         throw error;
       } finally {
         setIsLoadingApprove(false);
+
+        if (walletConnectStep === CONNECT_VIEW_STEPS.CONNECT_ERROR) {
+          onDismissWalletConnectBottomSheet();
+        }
       }
     }
   }, [
@@ -123,7 +131,8 @@ export const WalletConnectApprovalView = () => {
     setActiveSessions,
     onDismissWalletConnectBottomSheet,
     onShowToastNotification,
-    setWalletConnectStep
+    setWalletConnectStep,
+    walletConnectStep
   ]);
 
   const RenderFooterNode = useCallback(() => {

src/navigation/stacks/RootStack.tsx

@@ -36,6 +36,7 @@ export const RootStack = () => {
       />
       <Stack.Screen
         name="BarcodeScannerScreen"
+        initialParams={{ walletConnectEnabled: false }}
         options={{
           presentation: 'fullScreenModal',
           animation: 'slide_from_bottom'

src/screens/BarcodeScanner/index.tsx

@@ -27,7 +27,7 @@ const MOCK_ADDRESS = 'ethereum:0xF51452e37eEbf3226BcBB25FA4f9F570f176484e';
 export const BarcodeScannerScreen = ({ navigation, route }: Props) => {
   const { t } = useTranslation();
   const {
-    params: { onScanned }
+    params: { onScanned, walletConnectEnabled }
   } = route;
   const { top: topInset } = useSafeAreaInsets();
   const {
@@ -136,7 +136,7 @@ export const BarcodeScannerScreen = ({ navigation, route }: Props) => {
           <ScanSquare />
         </Camera>
       )}
-      {isCameraVisible && (
+      {isCameraVisible && walletConnectEnabled && (
         <View style={styles.footer}>
           <Row alignItems="center" style={styles.footerIconsRow}>
             <View style={styles.iconBox}>