novasamatech · sokolova-an · Nov 21, 2024 · Nov 20, 2024
diff --git a/src/renderer/entities/transaction/lib/transactionService.ts b/src/renderer/entities/transaction/lib/transactionService.ts
@@ -175,7 +175,7 @@ type TxWrappersParams = {
  * @returns {Array}
  */
 function getTxWrappers({ wallet, ...params }: TxWrappersParams): TxWrapper[] {
-  if (walletUtils.isMultisig(wallet)) {
+  if (walletUtils.isRegularMultisig(wallet)) {
     return getMultisigWrapper(params);
   }
 

diff --git a/src/renderer/entities/wallet/lib/__tests__/wallet-utils.test.ts b/src/renderer/entities/wallet/lib/__tests__/wallet-utils.test.ts
@@ -29,13 +29,25 @@ describe('entities/wallet/lib/wallet-utils', () => {
   test('isMultisig should return true when wallet type is Multisig', () => {
     const wallet = { type: WalletType.MULTISIG } as Wallet;
 
+    expect(walletUtils.isRegularMultisig(wallet)).toEqual(true);
+  });
+
+  test('isFlexibleMultisig should return true when wallet type is Flexible Multisig', () => {
+    const wallet = { type: WalletType.FLEXIBLE_MULTISIG } as Wallet;
+
+    expect(walletUtils.isFlexibleMultisig(wallet)).toEqual(true);
+  });
+
+  test('isMultisig should return true when wallet type is Flexible Multisig', () => {
+    const wallet = { type: WalletType.FLEXIBLE_MULTISIG } as Wallet;
+
     expect(walletUtils.isMultisig(wallet)).toEqual(true);
   });
 
   test('isMultisig should return false when wallet type is not Multisig', () => {
     const wallet = { type: WalletType.NOVA_WALLET } as Wallet;
 
-    expect(walletUtils.isMultisig(wallet)).toEqual(false);
+    expect(walletUtils.isRegularMultisig(wallet)).toEqual(false);
   });
 
   test('isNovaWallet should return true when wallet type is NovaWallet', () => {
@@ -47,7 +59,7 @@ describe('entities/wallet/lib/wallet-utils', () => {
   test('isNovaWallet should return false when wallet type is not NovaWallet', () => {
     const wallet = { type: WalletType.POLKADOT_VAULT } as Wallet;
 
-    expect(walletUtils.isMultisig(wallet)).toEqual(false);
+    expect(walletUtils.isRegularMultisig(wallet)).toEqual(false);
   });
 
   test('isProxied should return true when wallet type is Proxied', () => {

diff --git a/src/renderer/entities/wallet/lib/account-utils.ts b/src/renderer/entities/wallet/lib/account-utils.ts
@@ -28,8 +28,9 @@ import { walletUtils } from './wallet-utils';
 export const accountUtils = {
   isBaseAccount,
   isChainAccount,
-  isMultisigAccount,
+  isRegularMultisigAccount,
   isFlexibleMultisigAccount,
+  isMultisigAccount,
   isWcAccount,
   isProxiedAccount,
   isPureProxiedAccount,
@@ -74,14 +75,18 @@ function isShardAccount(account: Partial<Account>): account is ShardAccount {
   return account.type === AccountType.SHARD;
 }
 
-function isMultisigAccount(account: Partial<Account>): account is MultisigAccount {
+function isRegularMultisigAccount(account: Partial<Account>): account is MultisigAccount {
   return account.type === AccountType.MULTISIG;
 }
 
 function isFlexibleMultisigAccount(account: Partial<Account>): account is FlexibleMultisigAccount {
   return account.type === AccountType.FLEXIBLE_MULTISIG;
 }
 
+function isMultisigAccount(account: Partial<Account>): account is MultisigAccount | FlexibleMultisigAccount {
+  return isFlexibleMultisigAccount(account) || isRegularMultisigAccount(account);
+}
+
 function isProxiedAccount(account: Partial<Account>): account is ProxiedAccount {
   return account.type === AccountType.PROXIED;
 }

diff --git a/src/renderer/entities/wallet/lib/permission-utils.ts b/src/renderer/entities/wallet/lib/permission-utils.ts
@@ -44,7 +44,6 @@ function canStake(wallet: Wallet): boolean {
 function canCreateMultisigTx(wallet: Wallet): boolean {
   if (walletUtils.isWatchOnly(wallet)) return false;
   if (walletUtils.isMultisig(wallet)) return false;
-  if (walletUtils.isFlexibleMultisig(wallet)) return false;
   if (walletUtils.isProxied(wallet)) {
     const isAnyProxy = accountUtils.isAnyProxyType(wallet.accounts[0]);
     const isNonTransfer = accountUtils.isNonTransferProxyType(wallet.accounts[0]);
@@ -57,7 +56,6 @@ function canCreateMultisigTx(wallet: Wallet): boolean {
 function canApproveMultisigTx(wallet: Wallet): boolean {
   if (walletUtils.isWatchOnly(wallet)) return false;
   if (walletUtils.isMultisig(wallet)) return false;
-  if (walletUtils.isFlexibleMultisig(wallet)) return false;
 
   if (walletUtils.isProxied(wallet)) {
     return false;
@@ -74,7 +72,6 @@ function canApproveMultisigTx(wallet: Wallet): boolean {
 function canRejectMultisigTx(wallet: Wallet): boolean {
   if (walletUtils.isWatchOnly(wallet)) return false;
   if (walletUtils.isMultisig(wallet)) return false;
-  if (walletUtils.isFlexibleMultisig(wallet)) return false;
   if (walletUtils.isProxied(wallet)) {
     return false;
 

diff --git a/src/renderer/entities/wallet/lib/wallet-utils.ts b/src/renderer/entities/wallet/lib/wallet-utils.ts
@@ -22,6 +22,7 @@ export const walletUtils = {
   isSingleShard,
   isMultisig,
   isFlexibleMultisig,
+  isRegularMultisig,
   isWatchOnly,
   isNovaWallet,
   isWalletConnect,
@@ -54,12 +55,16 @@ function isSingleShard(wallet?: Wallet): wallet is SingleShardWallet {
   return wallet?.type === WalletType.SINGLE_PARITY_SIGNER;
 }
 
-function isMultisig(wallet?: Wallet): wallet is MultisigWallet {
+function isFlexibleMultisig(wallet?: Wallet): wallet is FlexibleMultisigWallet {
+  return wallet?.type === WalletType.FLEXIBLE_MULTISIG;
+}
+
+function isRegularMultisig(wallet?: Wallet): wallet is FlexibleMultisigWallet {
   return wallet?.type === WalletType.MULTISIG;
 }
 
-function isFlexibleMultisig(wallet?: Wallet): wallet is FlexibleMultisigWallet {
-  return wallet?.type === WalletType.FLEXIBLE_MULTISIG;
+function isMultisig(wallet?: Wallet): wallet is MultisigWallet | FlexibleMultisigWallet {
+  return isFlexibleMultisig(wallet) || isRegularMultisig(wallet);
 }
 
 function isWatchOnly(wallet?: Wallet): wallet is WatchOnlyWallet {

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
@@ -29,7 +29,7 @@ import {
   nonNullable,
   toAccountId,
   toAddress,
-  transferableAmount,
+  withdrawableAmountBN,
 } from '@/shared/lib/utils';
 import { createDepositCalculator, createFeeCalculator } from '@/shared/transactions';
 import { balanceModel, balanceUtils } from '@/entities/balance';
@@ -218,7 +218,7 @@ const $isEnoughBalance = combine(
     return fee
       .add(multisigDeposit)
       .add(new BN(proxyDeposit))
-      .lte(new BN(transferableAmount(balance)));
+      .lte(new BN(withdrawableAmountBN(balance)));
   },
 );
 
@@ -413,8 +413,6 @@ sample({
       name: name.trim(),
       accountId: multisigAccoutId!,
       threshold: threshold,
-      // TODO get proxy account
-      proxyAccountId: multisigAccoutId!,
       cryptoType: isEthereumChain ? CryptoType.ETHEREUM : CryptoType.SR25519,
       chainType: isEthereumChain ? ChainType.ETHEREUM : ChainType.SUBSTRATE,
       type: AccountType.FLEXIBLE_MULTISIG,

diff --git a/src/renderer/features/operations/OperationsConfirm/Delegate/ui/Confirmation.tsx b/src/renderer/features/operations/OperationsConfirm/Delegate/ui/Confirmation.tsx
@@ -161,7 +161,7 @@ export const Confirmation = ({
 
         <hr className="w-full border-filter-border pr-2" />
 
-        {accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
+        {confirmStore.shards?.[0] && accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
           <DetailRow
             className="text-text-primary"
             label={

diff --git a/src/renderer/features/operations/OperationsConfirm/EditDelegation/ui/Confirmation.tsx b/src/renderer/features/operations/OperationsConfirm/EditDelegation/ui/Confirmation.tsx
@@ -161,7 +161,7 @@ export const Confirmation = ({
 
         <hr className="w-full border-filter-border pr-2" />
 
-        {accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
+        {confirmStore.shards?.[0] && accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
           <DetailRow
             className="text-text-primary"
             label={

diff --git a/src/renderer/features/operations/OperationsConfirm/Nominate/ui/Confirmation.tsx b/src/renderer/features/operations/OperationsConfirm/Nominate/ui/Confirmation.tsx
@@ -82,7 +82,7 @@ export const Confirmation = ({ id = 0, secondaryActionButton, hideSignButton, on
 
           <hr className="w-full border-filter-border pr-2" />
 
-          {accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
+          {confirmStore.shards?.[0] && accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
             <DetailRow
               className="text-text-primary"
               label={

diff --git a/src/renderer/features/operations/OperationsConfirm/Payee/ui/Confirmation.tsx b/src/renderer/features/operations/OperationsConfirm/Payee/ui/Confirmation.tsx
@@ -77,7 +77,7 @@ export const Confirmation = ({ id = 0, onGoBack, secondaryActionButton, hideSign
 
           <hr className="w-full border-filter-border pr-2" />
 
-          {accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
+          {confirmStore.shards?.[0] && accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
             <DetailRow
               className="text-text-primary"
               label={

diff --git a/src/renderer/features/operations/OperationsConfirm/Restake/ui/Confirmation.tsx b/src/renderer/features/operations/OperationsConfirm/Restake/ui/Confirmation.tsx
@@ -75,7 +75,7 @@ export const Confirmation = ({ id = 0, onGoBack, secondaryActionButton, hideSign
           signatory={confirmStore.signatory}
           proxied={confirmStore.proxiedAccount}
         >
-          {accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
+          {confirmStore.shards?.[0] && accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
             <DetailRow
               className="text-text-primary"
               label={

diff --git a/src/renderer/features/operations/OperationsConfirm/Unstake/ui/Confirmation.tsx b/src/renderer/features/operations/OperationsConfirm/Unstake/ui/Confirmation.tsx
@@ -81,7 +81,7 @@ export const Confirmation = ({ id = 0, secondaryActionButton, hideSignButton, on
           signatory={confirmStore.signatory}
           proxied={confirmStore.proxiedAccount}
         >
-          {accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
+          {confirmStore.shards?.[0] && accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
             <DetailRow
               className="text-text-primary"
               label={

diff --git a/src/renderer/features/operations/OperationsConfirm/Withdraw/ui/Confirmation.tsx b/src/renderer/features/operations/OperationsConfirm/Withdraw/ui/Confirmation.tsx
@@ -75,7 +75,7 @@ export const Confirmation = ({ id = 0, secondaryActionButton, hideSignButton, on
           signatory={confirmStore.signatory}
           proxied={confirmStore.proxiedAccount}
         >
-          {accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
+          {confirmStore.shards?.[0] && accountUtils.isMultisigAccount(confirmStore.shards[0]) && (
             <DetailRow
               className="text-text-primary"
               label={

diff --git a/src/renderer/features/proxy-add-pure/model/form-model.ts b/src/renderer/features/proxy-add-pure/model/form-model.ts
@@ -474,13 +474,13 @@ sample({
   filter: (_, account) => Boolean(account),
   fn: ({ wallet, wallets }, account): Record<string, boolean> => {
     if (!wallet) return { isMultisig: false, isProxy: false };
-    if (walletUtils.isMultisig(wallet)) return { isMultisig: true, isProxy: false };
+    if (walletUtils.isRegularMultisig(wallet)) return { isMultisig: true, isProxy: false };
     if (!walletUtils.isProxied(wallet)) return { isMultisig: false, isProxy: false };
 
     const accountWallet = walletUtils.getWalletById(wallets, account!.walletId);
 
     return {
-      isMultisig: walletUtils.isMultisig(accountWallet),
+      isMultisig: walletUtils.isRegularMultisig(accountWallet),
       isProxy: true,
     };
   },

diff --git a/src/renderer/features/proxy-add/model/form-model.ts b/src/renderer/features/proxy-add/model/form-model.ts
@@ -565,13 +565,13 @@ sample({
   filter: (_, account) => Boolean(account),
   fn: ({ wallet, wallets }, account): Record<string, boolean> => {
     if (!wallet) return { isMultisig: false, isProxy: false };
-    if (walletUtils.isMultisig(wallet)) return { isMultisig: true, isProxy: false };
+    if (walletUtils.isRegularMultisig(wallet)) return { isMultisig: true, isProxy: false };
     if (!walletUtils.isProxied(wallet)) return { isMultisig: false, isProxy: false };
 
     const accountWallet = walletUtils.getWalletById(wallets, account!.walletId);
 
     return {
-      isMultisig: walletUtils.isMultisig(accountWallet),
+      isMultisig: walletUtils.isRegularMultisig(accountWallet),
       isProxy: true,
     };
   },

diff --git a/src/renderer/features/proxy-remove-pure/model/form-model.ts b/src/renderer/features/proxy-remove-pure/model/form-model.ts
@@ -271,13 +271,13 @@ sample({
   filter: (_, account) => Boolean(account),
   fn: ({ wallet, wallets }, account): Record<string, boolean> => {
     if (!wallet) return { isMultisig: false, isProxy: false };
-    if (walletUtils.isMultisig(wallet)) return { isMultisig: true, isProxy: false };
+    if (walletUtils.isRegularMultisig(wallet)) return { isMultisig: true, isProxy: false };
     if (!walletUtils.isProxied(wallet)) return { isMultisig: false, isProxy: false };
 
     const accountWallet = walletUtils.getWalletById(wallets, account!.walletId);
 
     return {
-      isMultisig: walletUtils.isMultisig(accountWallet),
+      isMultisig: walletUtils.isRegularMultisig(accountWallet),
       isProxy: true,
     };
   },

diff --git a/src/renderer/features/proxy-remove/model/form-model.ts b/src/renderer/features/proxy-remove/model/form-model.ts
@@ -271,13 +271,13 @@ sample({
   filter: (_, account) => Boolean(account),
   fn: ({ wallet, wallets }, account): Record<string, boolean> => {
     if (!wallet) return { isMultisig: false, isProxy: false };
-    if (walletUtils.isMultisig(wallet)) return { isMultisig: true, isProxy: false };
+    if (walletUtils.isRegularMultisig(wallet)) return { isMultisig: true, isProxy: false };
     if (!walletUtils.isProxied(wallet)) return { isMultisig: false, isProxy: false };
 
     const accountWallet = walletUtils.getWalletById(wallets, account!.walletId);
 
     return {
-      isMultisig: walletUtils.isMultisig(accountWallet),
+      isMultisig: walletUtils.isRegularMultisig(accountWallet),
       isProxy: true,
     };
   },

diff --git a/src/renderer/features/wallet-details/ui/components/WalletDetails.tsx b/src/renderer/features/wallet-details/ui/components/WalletDetails.tsx
@@ -37,6 +37,7 @@ export const WalletDetails = ({ isOpen, wallet, onClose }: Props) => {
     return <MultishardWalletDetails wallet={wallet} accounts={multiShardAccounts} onClose={onClose} />;
   }
 
+  // TODO: Separate wallet details for regular and flexible multisig
   if (walletUtils.isMultisig(wallet)) {
     return (
       <MultisigWalletDetails

diff --git a/src/renderer/features/wallet-details/ui/wallets/MultisigWalletDetails.tsx b/src/renderer/features/wallet-details/ui/wallets/MultisigWalletDetails.tsx
@@ -2,7 +2,13 @@ import { useUnit } from 'effector-react';
 import { useMemo } from 'react';
 import { Trans } from 'react-i18next';
 
-import { type AccountId, type Contact, type MultisigWallet, type Wallet } from '@/shared/core';
+import {
+  type AccountId,
+  type Contact,
+  type FlexibleMultisigWallet,
+  type MultisigWallet,
+  type Wallet,
+} from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { useModalClose, useToggle } from '@/shared/lib/hooks';
 import { toAddress } from '@/shared/lib/utils';
@@ -38,7 +44,7 @@ const {
 } = proxyAddPureFeature;
 
 type Props = {
-  wallet: MultisigWallet;
+  wallet: MultisigWallet | FlexibleMultisigWallet;
   signatoryWallets: [Wallet, AccountId][];
   signatoryContacts: Contact[];
   signatoryPeople: AccountId[];

diff --git a/src/renderer/features/wallet-fiat-balance/service/walletSelectService.ts b/src/renderer/features/wallet-fiat-balance/service/walletSelectService.ts
@@ -21,7 +21,7 @@ function getWalletByGroups(wallets: Wallet[], query = ''): Record<WalletFamily,
     let groupIndex: WalletFamily | undefined;
 
     if (walletUtils.isPolkadotVaultGroup(wallet)) groupIndex = WalletType.POLKADOT_VAULT;
-    if (walletUtils.isMultisig(wallet)) groupIndex = WalletType.MULTISIG;
+    if (walletUtils.isRegularMultisig(wallet)) groupIndex = WalletType.MULTISIG;
     if (walletUtils.isFlexibleMultisig(wallet)) groupIndex = WalletType.FLEXIBLE_MULTISIG;
     if (walletUtils.isWatchOnly(wallet)) groupIndex = WalletType.WATCH_ONLY;
     if (walletUtils.isWalletConnect(wallet)) groupIndex = WalletType.WALLET_CONNECT;

diff --git a/src/renderer/features/wallet-select/service/walletSelectService.ts b/src/renderer/features/wallet-select/service/walletSelectService.ts
@@ -21,7 +21,7 @@ function getWalletByGroups(wallets: Wallet[], query = ''): Record<WalletFamily,
     let groupIndex: WalletFamily | undefined;
 
     if (walletUtils.isPolkadotVaultGroup(wallet)) groupIndex = WalletType.POLKADOT_VAULT;
-    if (walletUtils.isMultisig(wallet)) groupIndex = WalletType.MULTISIG;
+    if (walletUtils.isRegularMultisig(wallet)) groupIndex = WalletType.MULTISIG;
     if (walletUtils.isFlexibleMultisig(wallet)) groupIndex = WalletType.FLEXIBLE_MULTISIG;
     if (walletUtils.isWatchOnly(wallet)) groupIndex = WalletType.WATCH_ONLY;
     if (walletUtils.isWalletConnect(wallet)) groupIndex = WalletType.WALLET_CONNECT;

diff --git a/src/renderer/pages/Operations/components/ActionSteps/Confirmation.tsx b/src/renderer/pages/Operations/components/ActionSteps/Confirmation.tsx
@@ -1,7 +1,14 @@
 import { useUnit } from 'effector-react';
 import { useEffect, useState } from 'react';
 
-import { type Account, type MultisigAccount, type MultisigTransaction, type Transaction } from '@/shared/core';
+import {
+  type Account,
+  type FlexibleMultisigAccount,
+  type FlexibleMultisigTransaction,
+  type MultisigAccount,
+  type MultisigTransaction,
+  type Transaction,
+} from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { getAssetById } from '@/shared/lib/utils';
 import { DetailRow, Icon } from '@/shared/ui';
@@ -23,8 +30,8 @@ import { TransactionAmount } from '@/pages/Operations/components/TransactionAmou
 import { Details } from '../Details';
 
 type Props = {
-  tx: MultisigTransaction;
-  account: MultisigAccount;
+  tx: MultisigTransaction | FlexibleMultisigTransaction;
+  account: MultisigAccount | FlexibleMultisigAccount;
   signAccount?: Account;
   chainConnection: ExtendedChain;
   feeTx?: Transaction;

diff --git a/src/renderer/pages/Operations/components/Details.tsx b/src/renderer/pages/Operations/components/Details.tsx
@@ -5,6 +5,8 @@ import { Trans } from 'react-i18next';
 import {
   type Account,
   type Address,
+  type FlexibleMultisigAccount,
+  type FlexibleMultisigTransaction,
   type MultisigAccount,
   type MultisigTransaction,
   type Transaction,
@@ -52,8 +54,8 @@ import {
 } from '../common/utils';
 
 type Props = {
-  tx: MultisigTransaction;
-  account?: MultisigAccount;
+  tx: MultisigTransaction | FlexibleMultisigTransaction;
+  account?: MultisigAccount | FlexibleMultisigAccount;
   signatory?: Account;
   extendedChain?: ExtendedChain;
 };

diff --git a/src/renderer/pages/Operations/components/EmptyState/EmptyOperations.tsx b/src/renderer/pages/Operations/components/EmptyState/EmptyOperations.tsx
@@ -1,9 +1,9 @@
-import { type MultisigAccount } from '@/shared/core';
+import { type FlexibleMultisigAccount, type MultisigAccount } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { BodyText, Icon } from '@/shared/ui';
 
 type Props = {
-  multisigAccount?: MultisigAccount;
+  multisigAccount?: MultisigAccount | FlexibleMultisigAccount;
   isEmptyFromFilters: boolean;
 };