novasamatech · sokolova-an · Nov 22, 2024 · Nov 21, 2024 · Nov 21, 2024 · Nov 22, 2024
diff --git a/...atures/flexible-multisig-create/components/SelectThreshold/SelectSignatoriesThreshold.tsx b/...atures/flexible-multisig-create/components/SelectThreshold/SelectSignatoriesThreshold.tsx
@@ -32,6 +32,7 @@ export const SelectSignatoriesThreshold = () => {
   const ownedSignatoriesWallets = useUnit(signatoryModel.$ownedSignatoriesWallets);
   const hasDuplicateSignatories = useUnit(signatoryModel.$hasDuplicateSignatories);
   const hasEmptySignatories = useUnit(signatoryModel.$hasEmptySignatories);
+  const hasEmptySignatoryName = useUnit(signatoryModel.$hasEmptySignatoryName);
 
   const hasOwnedSignatory = !!ownedSignatoriesWallets && ownedSignatoriesWallets?.length > 0;
   const hasEnoughSignatories = signatories.length >= MIN_THRESHOLD;
@@ -43,7 +44,9 @@ export const SelectSignatoriesThreshold = () => {
     !multisigAlreadyExists &&
     !hasEmptySignatories &&
     isThresholdValid &&
-    !hasDuplicateSignatories;
+    !hasEmptySignatoryName &&
+    !hasDuplicateSignatories &&
+    !hiddenMultisig;
 
   const onSubmit = (event: FormEvent) => {
     if (!hasClickedNext) {
@@ -96,6 +99,14 @@ export const SelectSignatoriesThreshold = () => {
           >
             <Alert.Item withDot={false}>{t('createMultisigAccount.notEmptySignatory')}</Alert.Item>
           </Alert>
+
+          <Alert
+            active={hasClickedNext && hasEmptySignatoryName}
+            title={t('createMultisigAccount.notEmptySignatoryNameTitle')}
+            variant="error"
+          >
+            <Alert.Item withDot={false}>{t('createMultisigAccount.notEmptySignatoryName')}</Alert.Item>
+          </Alert>
         </div>
         <div className="flex items-center gap-x-4">
           <Box width="300px">
@@ -141,11 +152,7 @@ export const SelectSignatoriesThreshold = () => {
             </Alert.Item>
           </Alert>
 
-          <Alert
-            active={!multisigAlreadyExists && Boolean(hiddenMultisig)}
-            title={t('createMultisigAccount.multisigExistTitle')}
-            variant="info"
-          >
+          <Alert active={Boolean(hiddenMultisig)} title={t('createMultisigAccount.multisigExistTitle')} variant="error">
             <Alert.Item withDot={false}>{t('createMultisigAccount.multisigHiddenExistText')}</Alert.Item>
             <Alert.Item withDot={false}>
               <Button

diff --git a/src/renderer/features/flexible-multisig-create/model/flexible-multisig-create.ts b/src/renderer/features/flexible-multisig-create/model/flexible-multisig-create.ts
@@ -39,7 +39,7 @@ import { networkModel, networkUtils } from '@/entities/network';
 import { getExtrinsic, transactionBuilder } from '@/entities/transaction';
 import { walletModel, walletUtils } from '@/entities/wallet';
 import { signModel } from '@/features/operations/OperationSign/model/sign-model';
-import { ExtrinsicResult, submitModel, submitUtils } from '@/features/operations/OperationSubmit';
+import { submitModel, submitUtils } from '@/features/operations/OperationSubmit';
 import { walletPairingModel } from '@/features/wallets';
 
 import { confirmModel } from './confirm-model';
@@ -378,9 +378,38 @@ sample({
     contacts: contactModel.$contacts,
   },
   fn: ({ signatories, contacts }) => {
+    const signatoriesWithoutSigner = signatories.slice(1);
+    const contactMap = new Map(contacts.map((c) => [c.accountId, c]));
+    const updatedContacts: Contact[] = [];
+
+    for (const { address, name } of signatoriesWithoutSigner) {
+      const contact = contactMap.get(toAccountId(address));
+
+      if (!contact) continue;
+
+      updatedContacts.push({
+        ...contact,
+        name,
+      });
+    }
+
+    return updatedContacts;
+  },
+  target: contactModel.effects.updateContactsFx,
+});
+
+sample({
+  clock: signModel.output.formSubmitted,
+  source: {
+    signatories: signatoryModel.$signatories,
+    contacts: contactModel.$contacts,
+  },
+  fn: ({ signatories, contacts }) => {
+    const contactsSet = new Set(contacts.map((c) => c.accountId));
+
     return signatories
       .slice(1)
-      .filter((signatory) => !contacts.some((contact) => contact.accountId === toAccountId(signatory.address)))
+      .filter((signatory) => !contactsSet.has(toAccountId(signatory.address)))
       .map(
         ({ address, name }) =>
           ({
@@ -450,26 +479,11 @@ sample({
 
 sample({
   clock: walletModel.events.walletCreatedDone,
+  filter: ({ wallet, external }) => wallet.type === WalletType.FLEXIBLE_MULTISIG && !external,
+  fn: ({ wallet }) => wallet.id,
   target: walletProviderModel.events.completed,
 });
 
-sample({
-  clock: submitModel.output.formSubmitted,
-  source: {
-    step: $step,
-    hiddenMultisig: formModel.$hiddenMultisig,
-  },
-  filter: ({ step, hiddenMultisig }, results) => {
-    const isSubmitStep = isStep(step, Step.SUBMIT);
-    const isNonNullable = nonNullable(hiddenMultisig);
-    const isSuccessResult = results[0]?.result === ExtrinsicResult.SUCCESS;
-
-    return isSubmitStep && isNonNullable && isSuccessResult;
-  },
-  fn: ({ hiddenMultisig }) => hiddenMultisig!.id,
-  target: walletModel.events.walletRemoved,
-});
-
 sample({
   clock: delay(submitModel.output.formSubmitted, 2000),
   source: $step,

diff --git a/src/renderer/features/flexible-multisig-create/model/form-model.ts b/src/renderer/features/flexible-multisig-create/model/form-model.ts
@@ -1,7 +1,7 @@
-import { combine, createEvent, sample } from 'effector';
+import { combine, sample } from 'effector';
 import { createForm } from 'effector-forms';
 
-import { type Chain, type ChainId, CryptoType, type Wallet } from '@/shared/core';
+import { type Chain, type ChainId, CryptoType } from '@/shared/core';
 import { nonNullable, toAccountId } from '@/shared/lib/utils';
 import { networkModel, networkUtils } from '@/entities/network';
 import { accountUtils, walletModel, walletUtils } from '@/entities/wallet';
@@ -10,8 +10,6 @@ import { signatoryModel } from './signatory-model';
 
 const DEFAULT_CHAIN: ChainId = '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'; // Polkadot
 
-const restoreWallet = createEvent<Wallet>();
-
 type FormParams = {
   threshold: number;
   chainId: ChainId;
@@ -144,11 +142,6 @@ sample({
   target: $createMultisigForm.fields.threshold.reset,
 });
 
-sample({
-  clock: restoreWallet,
-  target: walletModel.events.walletRestored,
-});
-
 export const formModel = {
   $createMultisigForm,
   $multisigAccountId,

diff --git a/src/renderer/features/flexible-multisig-create/model/signatory-model.ts b/src/renderer/features/flexible-multisig-create/model/signatory-model.ts
@@ -41,15 +41,24 @@ const $hasEmptySignatories = combine($signatories, (signatories) => {
   return signatories.map(({ address }) => address).includes('');
 });
 
+const $hasEmptySignatoryName = combine($signatories, (signatories) => {
+  return signatories.map(({ name }) => name).includes('');
+});
+
 const $ownedSignatoriesWallets = combine(
-  { wallets: walletModel.$wallets, signatories: $signatories },
-  ({ wallets, signatories }) =>
-    walletUtils.getWalletsFilteredAccounts(wallets, {
+  {
+    wallets: walletModel.$wallets,
+    signatories: $signatories,
+  },
+  ({ wallets, signatories }) => {
+    const matchWallets = walletUtils.getWalletsFilteredAccounts(wallets, {
       walletFn: (w) => walletUtils.isValidSignatory(w),
       accountFn: (a) => signatories.some((s) => toAccountId(s.address) === a.accountId),
-    }) || [],
-);
+    });
 
+    return matchWallets || [];
+  },
+);
 const populateBalanceFx = createEffect((wallets: Wallet[]) => {
   for (const wallet of wallets) {
     balanceSubModel.events.walletToSubSet(wallet);
@@ -104,6 +113,7 @@ export const signatoryModel = {
   $ownedSignatoriesWallets,
   $hasDuplicateSignatories,
   $hasEmptySignatories,
+  $hasEmptySignatoryName,
   events: {
     addSignatory,
     changeSignatory,

diff --git a/src/renderer/features/wallet-select/model/wallet-select-model.ts b/src/renderer/features/wallet-select/model/wallet-select-model.ts
@@ -92,6 +92,12 @@ sample({
   target: walletModel.events.selectWallet,
 });
 
+sample({
+  clock: walletModel.events.walletRestoredSuccess,
+  fn: ({ result }) => result.id,
+  target: walletModel.events.selectWallet,
+});
+
 sample({
   clock: walletModel.events.selectWallet,
   source: walletModel.$activeWallet,

diff --git a/src/renderer/widgets/CreateWallet/model/flow-model.ts b/src/renderer/widgets/CreateWallet/model/flow-model.ts
@@ -34,7 +34,7 @@ import { networkModel, networkUtils } from '@/entities/network';
 import { transactionService } from '@/entities/transaction';
 import { accountUtils, walletModel, walletUtils } from '@/entities/wallet';
 import { signModel } from '@/features/operations/OperationSign/model/sign-model';
-import { ExtrinsicResult, submitModel, submitUtils } from '@/features/operations/OperationSubmit';
+import { submitModel, submitUtils } from '@/features/operations/OperationSubmit';
 import { walletPairingModel } from '@/features/wallets';
 import { type AddMultisigStore, type FormSubmitEvent } from '../lib/types';
 
@@ -387,23 +387,6 @@ sample({
   }),
 });
 
-sample({
-  clock: submitModel.output.formSubmitted,
-  source: {
-    step: $step,
-    hiddenMultisig: formModel.$hiddenMultisig,
-  },
-  filter: ({ step, hiddenMultisig }, results) => {
-    const isSubmitStep = isStep(step, Step.SUBMIT);
-    const isNonNullable = nonNullable(hiddenMultisig);
-    const isSuccessResult = results[0]?.result === ExtrinsicResult.SUCCESS;
-
-    return isSubmitStep && isNonNullable && isSuccessResult;
-  },
-  fn: ({ hiddenMultisig }) => hiddenMultisig!.id,
-  target: walletModel.events.walletRemoved,
-});
-
 sample({
   clock: delay(submitModel.output.formSubmitted, 2000),
   source: $step,

diff --git a/src/renderer/widgets/CreateWallet/model/form-model.ts b/src/renderer/widgets/CreateWallet/model/form-model.ts
@@ -1,7 +1,7 @@
-import { combine, createEvent, sample } from 'effector';
+import { combine, sample } from 'effector';
 import { createForm } from 'effector-forms';
 
-import { type Chain, type ChainId, CryptoType, type Wallet } from '@/shared/core';
+import { type Chain, type ChainId, CryptoType } from '@/shared/core';
 import { nonNullable, toAccountId } from '@/shared/lib/utils';
 import { networkModel, networkUtils } from '@/entities/network';
 import { accountUtils, walletModel, walletUtils } from '@/entities/wallet';
@@ -11,8 +11,6 @@ import { signatoryModel } from './signatory-model';
 
 const DEFAULT_CHAIN: ChainId = '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'; // Polkadot
 
-const restoreWallet = createEvent<Wallet>();
-
 const $createMultisigForm = createForm<FormParams>({
   fields: {
     threshold: {
@@ -139,11 +137,6 @@ sample({
   target: $createMultisigForm.fields.threshold.reset,
 });
 
-sample({
-  clock: restoreWallet,
-  target: walletModel.events.walletRestored,
-});
-
 export const formModel = {
   $chain,
   $createMultisigForm,

diff --git a/src/renderer/widgets/CreateWallet/ui/MultisigWallet/SelectSignatoriesThreshold.tsx b/src/renderer/widgets/CreateWallet/ui/MultisigWallet/SelectSignatoriesThreshold.tsx
@@ -50,7 +50,8 @@ export const SelectSignatoriesThreshold = () => {
     !hasEmptySignatories &&
     !hasEmptySignatoryName &&
     isThresholdValid &&
-    !hasDuplicateSignatories;
+    !hasDuplicateSignatories &&
+    !hiddenMultisig;
 
   const onSubmit = (event: FormEvent) => {
     if (!hasClickedNext) {
@@ -156,11 +157,7 @@ export const SelectSignatoriesThreshold = () => {
             </Alert.Item>
           </Alert>
 
-          <Alert
-            active={!multisigAlreadyExists && Boolean(hiddenMultisig)}
-            title={t('createMultisigAccount.multisigExistTitle')}
-            variant="info"
-          >
+          <Alert active={Boolean(hiddenMultisig)} title={t('createMultisigAccount.multisigExistTitle')} variant="error">
             <Alert.Item withDot={false}>{t('createMultisigAccount.multisigHiddenExistText')}</Alert.Item>
             <Alert.Item withDot={false}>
               <Button