From 87c1f330246f6f009494e717ee0ebef4f56b09d5 Mon Sep 17 00:00:00 2001
From: Andrey Sorokin <sorokin0andrey@gmail.com>
Date: Mon, 6 May 2024 12:28:36 +0500
Subject: [PATCH] fix bugs

---
 packages/mobile/src/core/TonConnect/TonConnectModal.tsx | 6 ++++--
 packages/shared/modals/AddWalletModal.tsx               | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/mobile/src/core/TonConnect/TonConnectModal.tsx b/packages/mobile/src/core/TonConnect/TonConnectModal.tsx
index 4b1b3d098..9085b127a 100644
--- a/packages/mobile/src/core/TonConnect/TonConnectModal.tsx
+++ b/packages/mobile/src/core/TonConnect/TonConnectModal.tsx
@@ -42,11 +42,13 @@ export const TonConnectModal = (props: TonConnectModalProps) => {
   const theme = useTheme();
   const nav = useNavigation();
   const [selectedWalletIdentifier, setSelectedWalletIdentifier] = React.useState<string>(
-    tk.wallet.isWatchOnly ? tk.walletForUnlock.identifier : tk.wallet.identifier,
+    tk.wallet.isWatchOnly || tk.wallet.isSigner
+      ? tk.walletForUnlock.identifier
+      : tk.wallet.identifier,
   );
   const allWallets = useWallets();
   const selectableWallets = useMemo(
-    () => allWallets.filter((wallet) => !wallet.isWatchOnly),
+    () => allWallets.filter((wallet) => !wallet.isWatchOnly && !wallet.isSigner),
     [allWallets],
   );
   const wallet = useMemo(
diff --git a/packages/shared/modals/AddWalletModal.tsx b/packages/shared/modals/AddWalletModal.tsx
index 32a264881..3a708c4f9 100644
--- a/packages/shared/modals/AddWalletModal.tsx
+++ b/packages/shared/modals/AddWalletModal.tsx
@@ -16,6 +16,8 @@ import { useUnlockVault } from '@tonkeeper/mobile/src/core/ModalContainer/NFTOpe
 import { getLastEnteredPasscode } from '@tonkeeper/mobile/src/store/wallet/sagas';
 import { config } from '@tonkeeper/mobile/src/config';
 import { InteractionManager } from 'react-native';
+import { walletActions } from '@tonkeeper/mobile/src/store/wallet';
+import { useDispatch } from 'react-redux';
 
 interface AddWalletModalProps {
   isTonConnect?: boolean;
@@ -25,6 +27,7 @@ interface AddWalletModalProps {
 export const AddWalletModal = memo<AddWalletModalProps>(({ isTonConnect, isImport }) => {
   const nav = useNavigation();
   const unlockVault = useUnlockVault();
+  const dispatch = useDispatch();
 
   const handleCreatePress = useCallback(async () => {
     if (tk.walletForUnlock) {
@@ -55,9 +58,10 @@ export const AddWalletModal = memo<AddWalletModalProps>(({ isTonConnect, isImpor
       }
     } else {
       nav.goBack();
+      dispatch(walletActions.generateVault());
       nav.navigate('CreateWalletStack');
     }
-  }, [nav]);
+  }, [nav, dispatch]);
 
   return (
     <Modal>