fix: hide multisig after deletion (#2618)

novasamatech · Nov 11, 2024 · 40033fa · 40033fa
1 parent cfecc26
commit 40033fa
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/src/renderer/entities/walletConnect/model/wallet-connect-model.ts b/src/renderer/entities/walletConnect/model/wallet-connect-model.ts
@@ -241,7 +241,7 @@ sample({
 
 sample({
   clock: updateWcAccountsFx.done,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   filter: (_, { result: accounts }) => Boolean(accounts?.length),
   fn: (wallets, { params }) => {
     return wallets.map<Wallet>((wallet) => {
@@ -392,7 +392,7 @@ sample({
 
 sample({
   clock: sessionTopicUpdatedFx.doneData,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   filter: (_, accounts) => Boolean(accounts?.length),
   fn: (wallets, accounts) => {
     const walletId = accounts![0].walletId;
@@ -429,7 +429,7 @@ sample({
 sample({
   clock: [$client, walletModel.events.walletCreatedDone],
   source: {
-    wallets: walletModel.$wallets,
+    wallets: walletModel.$allWallets,
     client: $client,
   },
   filter: ({ client }) => Boolean(client),

diff --git a/src/renderer/features/proxies/model/proxies-model.ts b/src/renderer/features/proxies/model/proxies-model.ts
@@ -310,7 +310,7 @@ sample({
 
 sample({
   clock: createProxiedWalletsFx.doneData,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   filter: (_, data) => Boolean(data && data.wallets.length && data.accounts.length),
   fn: (wallets, data) => {
     const accountsMap = dictionary(data.accounts, 'walletId');

diff --git a/src/renderer/features/wallets/RenameWallet/model/rename-wallet-model.ts b/src/renderer/features/wallets/RenameWallet/model/rename-wallet-model.ts
@@ -84,7 +84,7 @@ sample({
 
 sample({
   clock: renameWalletFx.doneData,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   fn: (wallets, updatedWallet) => {
     const updatedWalletIndex = wallets.findIndex((w) => w.id === updatedWallet.id);
 

diff --git a/src/renderer/features/wallets/WalletSelect/model/wallet-select-model.ts b/src/renderer/features/wallets/WalletSelect/model/wallet-select-model.ts
@@ -185,7 +185,7 @@ sample({
 
 sample({
   clock: walletSelectedFx.doneData,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   filter: (_, nextId) => Boolean(nextId),
   fn: (wallets, nextId) => {
     return wallets.map((wallet) => ({ ...wallet, isActive: wallet.id === nextId }));

diff --git a/src/renderer/pages/Onboarding/Vault/ManageVault/model/manage-vault-model.ts b/src/renderer/pages/Onboarding/Vault/ManageVault/model/manage-vault-model.ts
@@ -153,7 +153,7 @@ sample({ clock: vaultCreated, target: createVaultFx });
 // TODO: should use factory
 sample({
   clock: createVaultFx.doneData,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   filter: (_, data) => Boolean(data),
   fn: (wallets, data) => wallets.concat(data!),
   target: walletModel.$allWallets,

diff --git a/src/renderer/processes/multisigs/model/multisigs-model.ts b/src/renderer/processes/multisigs/model/multisigs-model.ts
@@ -113,18 +113,17 @@ sample({
   clock: [multisigsDiscoveryTriggered, once(networkModel.$connections)],
   source: {
     chains: $multisigChains,
-    wallets: walletModel.$wallets,
-    hiddenWallets: walletModel.$hiddenWallets,
+    wallets: walletModel.$allWallets,
     connections: networkModel.$connections,
   },
-  fn: ({ chains, wallets, hiddenWallets, connections }) => {
+  fn: ({ chains, wallets, connections }) => {
     const filteredChains = chains.filter(
       (chain) => connections[chain.chainId] && !networkUtils.isDisabledConnection(connections[chain.chainId]),
     );
 
     return {
       chains: filteredChains,
-      wallets: wallets.concat(hiddenWallets),
+      wallets: wallets,
     };
   },
   target: getMultisigsFx,

diff --git a/src/renderer/widgets/CreateWallet/ui/MultisigWallet/SelectSignatoriesThreshold.tsx b/src/renderer/widgets/CreateWallet/ui/MultisigWallet/SelectSignatoriesThreshold.tsx
@@ -138,11 +138,7 @@ export const SelectSignatoriesThreshold = () => {
           </Alert>
         </div>
         <div className="flex items-end gap-x-4">
-          <Alert
-            active={Boolean(multisigAlreadyExists)}
-            title={t('createMultisigAccount.multisigExistTitle')}
-            variant="error"
-          >
+          <Alert active={multisigAlreadyExists} title={t('createMultisigAccount.multisigExistTitle')} variant="error">
             <Alert.Item withDot={false}>{t('createMultisigAccount.multisigExistText')}</Alert.Item>
           </Alert>
 
@@ -156,7 +152,11 @@ export const SelectSignatoriesThreshold = () => {
             </Alert.Item>
           </Alert>
 
-          <Alert active={Boolean(hiddenMultisig)} title={t('createMultisigAccount.multisigExistTitle')} variant="info">
+          <Alert
+            active={!multisigAlreadyExists && Boolean(hiddenMultisig)}
+            title={t('createMultisigAccount.multisigExistTitle')}
+            variant="info"
+          >
             <Alert.Item withDot={false}>{t('createMultisigAccount.multisigHiddenExistText')}</Alert.Item>
             <Alert.Item withDot={false}>
               <Button

diff --git a/src/renderer/widgets/WalletDetails/model/vault-details-model.ts b/src/renderer/widgets/WalletDetails/model/vault-details-model.ts
@@ -85,7 +85,7 @@ sample({
 
 sample({
   clock: removeKeysFx.doneData,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   filter: (_, ids) => Boolean(ids),
   fn: (wallets, ids) => {
     const removeMap = ids!.reduce<Record<ID, boolean>>((acc, id) => ({ ...acc, [id]: true }), {});
@@ -108,7 +108,7 @@ sample({ clock: accountsCreated, target: createAccountsFx });
 
 sample({
   clock: createAccountsFx.done,
-  source: walletModel.$wallets,
+  source: walletModel.$allWallets,
   filter: (_, { result }) => Boolean(result),
   fn: (wallets, { params, result }) => {
     return wallets.map((wallet) => {