From e81b56105f35b2d39c9665bd2ec39c65443a99eb Mon Sep 17 00:00:00 2001
From: Sergey Zhuravlev <zhuravlev1337@gmail.com>
Date: Tue, 12 Nov 2024 16:04:34 +0100
Subject: [PATCH 1/2] feat: add flexible multisig wallet and account types

---
 .../entities/wallet/lib/permission-utils.ts   |  3 +++
 .../entities/wallet/lib/wallet-utils.ts       | 11 ++++++++++
 .../entities/wallet/ui/Cards/WalletCardMd.tsx |  5 ++++-
 .../wallet/ui/WalletIcon/WalletIcon.tsx       |  1 +
 .../emptyList/ui/EmptyAccountMessage.tsx      |  1 +
 .../model/flexible-multisig-create.ts         |  6 ++---
 .../service/walletSelectService.ts            |  2 ++
 .../wallet-select/components/WalletGroup.tsx  |  1 +
 .../__tests__/wallet-select-model.test.ts     |  1 +
 .../service/walletSelectService.ts            |  2 ++
 .../flexibleMultisigBackground.svg            | 13 +++++++++++
 src/renderer/shared/core/index.ts             |  2 ++
 src/renderer/shared/core/types/account.ts     | 22 ++++++++++++++++---
 src/renderer/shared/core/types/wallet.ts      |  9 ++++++++
 src/renderer/shared/i18n/locales/en.json      |  5 ++++-
 .../shared/ui/Icon/data/walletType.tsx        |  4 ++++
 .../widgets/CreateWallet/model/flow-model.ts  |  5 ++---
 .../CreateWallet/ui/CreateWalletProvider.tsx  |  1 +
 18 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100644 src/renderer/shared/assets/images/walletTypes/flexibleMultisigBackground.svg

diff --git a/src/renderer/entities/wallet/lib/permission-utils.ts b/src/renderer/entities/wallet/lib/permission-utils.ts
index 5739ee19e..066c201c4 100644
--- a/src/renderer/entities/wallet/lib/permission-utils.ts
+++ b/src/renderer/entities/wallet/lib/permission-utils.ts
@@ -44,6 +44,7 @@ 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]);
@@ -56,6 +57,7 @@ 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;
@@ -72,6 +74,7 @@ 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
index a83f821d3..c1137a372 100644
--- a/src/renderer/entities/wallet/lib/wallet-utils.ts
+++ b/src/renderer/entities/wallet/lib/wallet-utils.ts
@@ -1,5 +1,6 @@
 import {
   type Account,
+  type FlexibleMultisigWallet,
   type ID,
   type MultiShardWallet,
   type MultisigWallet,
@@ -20,6 +21,7 @@ export const walletUtils = {
   isMultiShard,
   isSingleShard,
   isMultisig,
+  isFlexibleMultisig,
   isWatchOnly,
   isNovaWallet,
   isWalletConnect,
@@ -33,6 +35,7 @@ export const walletUtils = {
 
   getAccountBy,
   getAccountsBy,
+  getAllAccounts,
   getWalletFilteredAccounts,
   getWalletsFilteredAccounts,
 };
@@ -55,6 +58,10 @@ function isMultisig(wallet?: Wallet): wallet is MultisigWallet {
   return wallet?.type === WalletType.MULTISIG;
 }
 
+function isFlexibleMultisig(wallet?: Wallet): wallet is FlexibleMultisigWallet {
+  return wallet?.type === WalletType.FLEXIBLE_MULTISIG;
+}
+
 function isWatchOnly(wallet?: Wallet): wallet is WatchOnlyWallet {
   return wallet?.type === WalletType.WATCH_ONLY;
 }
@@ -111,6 +118,10 @@ function getAccountsBy(wallets: Wallet[], accountFn: (account: Account, wallet:
   }, []);
 }
 
+function getAllAccounts(wallets: Wallet[]): Account[] {
+  return wallets.reduce<Account[]>((acc, wallet) => acc.concat(wallet.accounts), []);
+}
+
 function getAccountBy(wallets: Wallet[], accountFn: (account: Account, wallet: Wallet) => boolean): Account | null {
   for (const wallet of wallets) {
     const account = wallet.accounts.find((account) => accountFn(account, wallet));
diff --git a/src/renderer/entities/wallet/ui/Cards/WalletCardMd.tsx b/src/renderer/entities/wallet/ui/Cards/WalletCardMd.tsx
index 78cb5c8dd..a1d2d0dae 100644
--- a/src/renderer/entities/wallet/ui/Cards/WalletCardMd.tsx
+++ b/src/renderer/entities/wallet/ui/Cards/WalletCardMd.tsx
@@ -36,7 +36,10 @@ export const WalletCardMd = ({ wallet, description, prefix, hideIcon, className,
         className,
       )}
     >
-      <button className="flex w-full items-center gap-x-2 rounded px-2 py-1.5" onClick={handleClick(onClick)}>
+      <button
+        className={cnTw('flex w-full items-center gap-x-2 rounded px-2 py-1.5', { 'pe-6': onInfoClick })}
+        onClick={handleClick(onClick)}
+      >
         {prefix}
 
         {!hideIcon && <WalletIcon type={wallet.type} size={20} />}
diff --git a/src/renderer/entities/wallet/ui/WalletIcon/WalletIcon.tsx b/src/renderer/entities/wallet/ui/WalletIcon/WalletIcon.tsx
index b89ad84bd..eeef056f4 100644
--- a/src/renderer/entities/wallet/ui/WalletIcon/WalletIcon.tsx
+++ b/src/renderer/entities/wallet/ui/WalletIcon/WalletIcon.tsx
@@ -7,6 +7,7 @@ const WalletIconNames: Record<WalletType, IconNames> = {
   [WalletType.SINGLE_PARITY_SIGNER]: 'vaultBackground',
   [WalletType.WATCH_ONLY]: 'watchOnlyBackground',
   [WalletType.MULTISIG]: 'multisigBackground',
+  [WalletType.FLEXIBLE_MULTISIG]: 'flexibleMultisigBackground',
   [WalletType.MULTISHARD_PARITY_SIGNER]: 'vaultBackground',
   [WalletType.WALLET_CONNECT]: 'walletConnectBackground',
   [WalletType.NOVA_WALLET]: 'novaWalletBackground',
diff --git a/src/renderer/features/emptyList/ui/EmptyAccountMessage.tsx b/src/renderer/features/emptyList/ui/EmptyAccountMessage.tsx
index dd655d07d..e8abae611 100644
--- a/src/renderer/features/emptyList/ui/EmptyAccountMessage.tsx
+++ b/src/renderer/features/emptyList/ui/EmptyAccountMessage.tsx
@@ -4,6 +4,7 @@ import { useI18n } from '@/shared/i18n';
 const Messages: Record<WalletType, string> = {
   [WalletType.POLKADOT_VAULT]: 'emptyState.createOrImportAccount',
   [WalletType.MULTISIG]: 'emptyState.createMultisig',
+  [WalletType.FLEXIBLE_MULTISIG]: 'emptyState.createFlexibleMultisig',
   [WalletType.MULTISHARD_PARITY_SIGNER]: 'emptyState.createAccount',
   [WalletType.NOVA_WALLET]: 'emptyState.createAccount',
   [WalletType.PROXIED]: 'emptyState.createAccount',
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
index 4c7ec5a3b..d5dceba42 100644
--- a/src/renderer/features/flexible-multisig-create/model/flexible-multisig-create.ts
+++ b/src/renderer/features/flexible-multisig-create/model/flexible-multisig-create.ts
@@ -415,7 +415,7 @@ type CreateWalletParams = {
   name: string;
   threshold: number;
   signatories: Signatory[];
-  chainId: ChainId | null;
+  chainId: ChainId;
   isEthereumChain: boolean;
 };
 
@@ -425,6 +425,7 @@ const createWalletFx = createEffect(
     const accountIds = signatories.map((s) => s.accountId);
     const accountId = accountUtils.getMultisigAccountId(accountIds, threshold, cryptoType);
 
+    // TODO implement flexible multisig creation
     walletModel.events.multisigCreated({
       wallet: {
         name,
@@ -434,11 +435,10 @@ const createWalletFx = createEffect(
       accounts: [
         {
           signatories,
-          chainId: chainId || undefined,
+          chainId,
           name: name.trim(),
           accountId: accountId,
           threshold: threshold,
-          creatorAccountId: accountId,
           cryptoType: isEthereumChain ? CryptoType.ETHEREUM : CryptoType.SR25519,
           chainType: isEthereumChain ? ChainType.ETHEREUM : ChainType.SUBSTRATE,
           type: AccountType.MULTISIG,
diff --git a/src/renderer/features/wallet-fiat-balance/service/walletSelectService.ts b/src/renderer/features/wallet-fiat-balance/service/walletSelectService.ts
index 4f8d4a5f1..32f3ee778 100644
--- a/src/renderer/features/wallet-fiat-balance/service/walletSelectService.ts
+++ b/src/renderer/features/wallet-fiat-balance/service/walletSelectService.ts
@@ -10,6 +10,7 @@ function getWalletByGroups(wallets: Wallet[], query = ''): Record<WalletFamily,
   const accumulator: Record<WalletFamily, Wallet[]> = {
     [WalletType.POLKADOT_VAULT]: [],
     [WalletType.MULTISIG]: [],
+    [WalletType.FLEXIBLE_MULTISIG]: [],
     [WalletType.NOVA_WALLET]: [],
     [WalletType.WALLET_CONNECT]: [],
     [WalletType.WATCH_ONLY]: [],
@@ -21,6 +22,7 @@ function getWalletByGroups(wallets: Wallet[], query = ''): Record<WalletFamily,
 
     if (walletUtils.isPolkadotVaultGroup(wallet)) groupIndex = WalletType.POLKADOT_VAULT;
     if (walletUtils.isMultisig(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;
     if (walletUtils.isNovaWallet(wallet)) groupIndex = WalletType.NOVA_WALLET;
diff --git a/src/renderer/features/wallet-select/components/WalletGroup.tsx b/src/renderer/features/wallet-select/components/WalletGroup.tsx
index 7f496beb6..a3f1cc142 100644
--- a/src/renderer/features/wallet-select/components/WalletGroup.tsx
+++ b/src/renderer/features/wallet-select/components/WalletGroup.tsx
@@ -14,6 +14,7 @@ const {
 export const GROUP_LABELS: Record<WalletFamily, string> = {
   [WalletType.POLKADOT_VAULT]: 'wallets.paritySignerLabel',
   [WalletType.MULTISIG]: 'wallets.multisigLabel',
+  [WalletType.FLEXIBLE_MULTISIG]: 'wallets.flexibleMultisigLabel',
   [WalletType.WALLET_CONNECT]: 'wallets.walletConnectLabel',
   [WalletType.NOVA_WALLET]: 'wallets.novaWalletLabel',
   [WalletType.WATCH_ONLY]: 'wallets.watchOnlyLabel',
diff --git a/src/renderer/features/wallet-select/model/__tests__/wallet-select-model.test.ts b/src/renderer/features/wallet-select/model/__tests__/wallet-select-model.test.ts
index ee53f1a0b..9fb8aa755 100644
--- a/src/renderer/features/wallet-select/model/__tests__/wallet-select-model.test.ts
+++ b/src/renderer/features/wallet-select/model/__tests__/wallet-select-model.test.ts
@@ -42,6 +42,7 @@ describe('wallet-select-model', () => {
     const emptyGroups: Record<WalletFamily, Wallet[]> = {
       [WalletType.POLKADOT_VAULT]: [],
       [WalletType.MULTISIG]: [],
+      [WalletType.FLEXIBLE_MULTISIG]: [],
       [WalletType.NOVA_WALLET]: [],
       [WalletType.WALLET_CONNECT]: [],
       [WalletType.WATCH_ONLY]: [],
diff --git a/src/renderer/features/wallet-select/service/walletSelectService.ts b/src/renderer/features/wallet-select/service/walletSelectService.ts
index 4f8d4a5f1..32f3ee778 100644
--- a/src/renderer/features/wallet-select/service/walletSelectService.ts
+++ b/src/renderer/features/wallet-select/service/walletSelectService.ts
@@ -10,6 +10,7 @@ function getWalletByGroups(wallets: Wallet[], query = ''): Record<WalletFamily,
   const accumulator: Record<WalletFamily, Wallet[]> = {
     [WalletType.POLKADOT_VAULT]: [],
     [WalletType.MULTISIG]: [],
+    [WalletType.FLEXIBLE_MULTISIG]: [],
     [WalletType.NOVA_WALLET]: [],
     [WalletType.WALLET_CONNECT]: [],
     [WalletType.WATCH_ONLY]: [],
@@ -21,6 +22,7 @@ function getWalletByGroups(wallets: Wallet[], query = ''): Record<WalletFamily,
 
     if (walletUtils.isPolkadotVaultGroup(wallet)) groupIndex = WalletType.POLKADOT_VAULT;
     if (walletUtils.isMultisig(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;
     if (walletUtils.isNovaWallet(wallet)) groupIndex = WalletType.NOVA_WALLET;
diff --git a/src/renderer/shared/assets/images/walletTypes/flexibleMultisigBackground.svg b/src/renderer/shared/assets/images/walletTypes/flexibleMultisigBackground.svg
new file mode 100644
index 000000000..fcdae8e95
--- /dev/null
+++ b/src/renderer/shared/assets/images/walletTypes/flexibleMultisigBackground.svg
@@ -0,0 +1,13 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ill_wall_flex_multisig_20">
+<rect x="0.400391" width="20" height="20" rx="10" fill="url(#paint0_linear_8621_1014)"/>
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M14.4873 11.5206L16.2314 9.78048C16.5359 9.473 16.7279 9.07189 16.7765 8.64189C16.825 8.21188 16.7273 7.77805 16.4991 7.41039L16.5739 7.33952C16.6153 7.2982 16.6482 7.24911 16.6706 7.19506C16.693 7.14102 16.7046 7.08308 16.7046 7.02456C16.7046 6.96605 16.693 6.90811 16.6706 6.85406C16.6482 6.80002 16.6153 6.75093 16.5739 6.7096L15.1802 5.31196C15.1388 5.27053 15.0898 5.23767 15.0357 5.21524C14.9817 5.19282 14.9237 5.18127 14.8652 5.18127C14.8067 5.18127 14.7488 5.19282 14.6947 5.21524C14.6407 5.23767 14.5916 5.27053 14.5502 5.31196L9.66834 10.1939C9.62763 10.2455 9.59692 10.3042 9.57779 10.3671L8.88094 12.4616C8.8505 12.5382 8.84174 12.6217 8.85563 12.703C8.86952 12.7842 8.90552 12.8601 8.95968 12.9222C9.0442 13.0042 9.15691 13.0507 9.27464 13.0521C9.32837 13.0525 9.38172 13.0432 9.43212 13.0246L11.5227 12.3277C11.5886 12.3058 11.6481 12.268 11.6959 12.2175L15.8416 8.07575C15.9058 8.25947 15.9173 8.45749 15.8749 8.64742C15.8324 8.83735 15.7377 9.01163 15.6014 9.15055L13.8573 10.8907C13.816 10.9321 13.7832 10.9812 13.7608 11.0352C13.7384 11.0893 13.7269 11.1472 13.7269 11.2057C13.7269 11.2642 13.7384 11.3221 13.7608 11.3761C13.7832 11.4302 13.816 11.4793 13.8573 11.5206C13.8987 11.562 13.9478 11.5948 14.0018 11.6172C14.0559 11.6396 14.1138 11.6511 14.1723 11.6511C14.2308 11.6511 14.2887 11.6396 14.3427 11.6172C14.3968 11.5948 14.4459 11.562 14.4873 11.5206ZM16.4636 14.4247C16.4636 14.2072 16.2874 14.031 16.0699 14.031H4.40542C4.18799 14.031 4.01172 14.2072 4.01172 14.4247C4.01172 14.6421 4.18799 14.8184 4.40542 14.8184H16.0699C16.2874 14.8184 16.4636 14.6421 16.4636 14.4247Z" fill="white"/>
+<path id="Vector" d="M6.95248 11.7613L10.0485 8.66889L11.3376 7.37253L11.4059 7.30783C11.4438 7.2701 11.4738 7.22528 11.4942 7.17594C11.5147 7.1266 11.5252 7.0737 11.5252 7.02028C11.5252 6.96686 11.5147 6.91396 11.4942 6.86462C11.4738 6.81527 11.4438 6.77045 11.4059 6.73273L10.1335 5.45671C10.0958 5.41889 10.051 5.38889 10.0016 5.36841C9.95228 5.34794 9.89939 5.3374 9.84596 5.3374C9.79254 5.3374 9.73965 5.34794 9.6903 5.36841C9.64096 5.38889 9.59614 5.41889 9.55841 5.45671L5.10136 9.91377C5.06419 9.96088 5.03615 10.0145 5.01869 10.0719L4.38248 11.9841C4.35469 12.0541 4.34669 12.1303 4.35937 12.2045C4.37206 12.2787 4.40492 12.3479 4.45437 12.4047C4.53154 12.4795 4.63443 12.522 4.74192 12.5233C4.79097 12.5237 4.83968 12.5151 4.8857 12.4981L6.79432 11.8619C6.85453 11.8419 6.90887 11.8074 6.95248 11.7613Z" stroke="white" stroke-width="0.624458" stroke-miterlimit="16" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1.25 1.25"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_8621_1014" x1="17.2064" y1="2.24788" x2="3.6632" y2="17.7258" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8707D5"/>
+<stop offset="1" stop-color="#FF6928"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/renderer/shared/core/index.ts b/src/renderer/shared/core/index.ts
index b8b101a31..e14eeb3d0 100644
--- a/src/renderer/shared/core/index.ts
+++ b/src/renderer/shared/core/index.ts
@@ -13,6 +13,7 @@ export type {
   SingleShardWallet,
   MultiShardWallet,
   MultisigWallet,
+  FlexibleMultisigWallet,
   WatchOnlyWallet,
   WalletConnectWallet,
   NovaWalletWallet,
@@ -30,6 +31,7 @@ export type {
   BaseAccount,
   ChainAccount,
   MultisigAccount,
+  FlexibleMultisigAccount,
   WcAccount,
   ProxiedAccount,
   ShardAccount,
diff --git a/src/renderer/shared/core/types/account.ts b/src/renderer/shared/core/types/account.ts
index 41d19eb83..04229c3b4 100644
--- a/src/renderer/shared/core/types/account.ts
+++ b/src/renderer/shared/core/types/account.ts
@@ -46,9 +46,17 @@ export type MultisigAccount = GenericAccount & {
   type: AccountType.MULTISIG;
   signatories: Signatory[];
   threshold: MultisigThreshold;
-  chainId?: ChainId;
+  chainId: ChainId;
+  cryptoType: CryptoType;
+};
+
+export type FlexibleMultisigAccount = GenericAccount & {
+  type: AccountType.FLEXIBLE_MULTISIG;
+  proxyAccountId: AccountId;
+  signatories: Signatory[];
+  threshold: MultisigThreshold;
+  chainId: ChainId;
   cryptoType: CryptoType;
-  creatorAccountId: AccountId;
 };
 
 export type WcAccount = GenericAccount & {
@@ -68,7 +76,14 @@ export type ProxiedAccount = GenericAccount & {
   cryptoType: CryptoType;
 };
 
-export type Account = BaseAccount | ChainAccount | ShardAccount | MultisigAccount | WcAccount | ProxiedAccount;
+export type Account =
+  | BaseAccount
+  | ChainAccount
+  | ShardAccount
+  | MultisigAccount
+  | WcAccount
+  | ProxiedAccount
+  | FlexibleMultisigAccount;
 
 export type DraftAccount<T extends Account> = Omit<NoID<T>, 'accountId' | 'walletId' | 'baseId'>;
 
@@ -77,6 +92,7 @@ export const enum AccountType {
   CHAIN = 'chain',
   SHARD = 'shard',
   MULTISIG = 'multisig',
+  FLEXIBLE_MULTISIG = 'flexible_multisig',
   WALLET_CONNECT = 'wallet_connect',
   PROXIED = 'proxied',
 }
diff --git a/src/renderer/shared/core/types/wallet.ts b/src/renderer/shared/core/types/wallet.ts
index 0d82781bf..91d6c3022 100644
--- a/src/renderer/shared/core/types/wallet.ts
+++ b/src/renderer/shared/core/types/wallet.ts
@@ -2,6 +2,7 @@ import {
   type Account,
   type BaseAccount,
   type ChainAccount,
+  type FlexibleMultisigAccount,
   type MultisigAccount,
   type ProxiedAccount,
   type ShardAccount,
@@ -45,6 +46,12 @@ export interface MultisigWallet extends Wallet {
   accounts: MultisigAccount[];
 }
 
+// TODO: try to move signatories data out of account
+export interface FlexibleMultisigWallet extends Wallet {
+  type: WalletType.FLEXIBLE_MULTISIG;
+  accounts: FlexibleMultisigAccount[];
+}
+
 export interface ProxiedWallet extends Wallet {
   type: WalletType.PROXIED;
   accounts: ProxiedAccount[];
@@ -68,6 +75,7 @@ export const enum WalletType {
   WATCH_ONLY = 'wallet_wo',
   POLKADOT_VAULT = 'wallet_pv',
   MULTISIG = 'wallet_ms',
+  FLEXIBLE_MULTISIG = 'wallet_fxms',
   WALLET_CONNECT = 'wallet_wc',
   NOVA_WALLET = 'wallet_nw',
   PROXIED = 'wallet_pxd',
@@ -87,6 +95,7 @@ export type SignableWalletFamily =
 export type WalletFamily =
   | WalletType.POLKADOT_VAULT
   | WalletType.MULTISIG
+  | WalletType.FLEXIBLE_MULTISIG
   | WalletType.WATCH_ONLY
   | WalletType.WALLET_CONNECT
   | WalletType.NOVA_WALLET
diff --git a/src/renderer/shared/i18n/locales/en.json b/src/renderer/shared/i18n/locales/en.json
index 4052c16e1..53ba09b94 100644
--- a/src/renderer/shared/i18n/locales/en.json
+++ b/src/renderer/shared/i18n/locales/en.json
@@ -298,6 +298,7 @@
     "addNewAccountButton": "Add new account",
     "createAccount": "Create a new account",
     "createMultisig": "Create a new multisig wallet",
+    "createFlexibleMultisig": "Create a new flexible multisig wallet",
     "createOrImportAccount": "Create a new account or import an existing one"
   },
   "fallbackScreen": {
@@ -1157,7 +1158,8 @@
       "identityJudgement": "Judgement operations",
       "nominationPools": "Nominations operations",
       "nonTransfer": "All, except transfer operations",
-      "staking": "Staking operations"
+      "staking": "Staking operations",
+      "unknown": "Unknown operations"
     },
     "operations": {
       "any": "all operations",
@@ -1703,6 +1705,7 @@
     "disconnectedLabel": "Disconnected",
     "multishardLabel": "Multishard",
     "multisigLabel": "Multisig",
+    "flexibleMultisigLabel": "Flexible Multisig",
     "novaWalletLabel": "Nova Wallet",
     "paritySignerLabel": "Polkadot Vault",
     "proxiedLabel": "Delegated to you (Proxied)",
diff --git a/src/renderer/shared/ui/Icon/data/walletType.tsx b/src/renderer/shared/ui/Icon/data/walletType.tsx
index d94785a22..a045c7cc0 100644
--- a/src/renderer/shared/ui/Icon/data/walletType.tsx
+++ b/src/renderer/shared/ui/Icon/data/walletType.tsx
@@ -1,5 +1,8 @@
 /* eslint-disable import-x/max-dependencies */
 
+import FlexibleMultisigBackgroundImg, {
+  ReactComponent as FlexibleMultisigBackgroundSvg,
+} from '@/shared/assets/images/walletTypes/flexibleMultisigBackground.svg';
 import LedgerOnboardingImg, {
   ReactComponent as LedgerOnboardingSvg,
 } from '@/shared/assets/images/walletTypes/ledgerOnboarding.svg';
@@ -44,6 +47,7 @@ const WalletTypeImages = {
   watchOnlyBackground: { svg: WatchOnlyBackgroundSvg, img: WatchOnlyBackgroundImg },
   watchOnlyOnboarding: { svg: WatchOnlyOnboardingSvg, img: WatchOnlyOnboardingImg },
   multisigBackground: { svg: MultisigBackgroundSvg, img: MultisigBackgroundImg },
+  flexibleMultisigBackground: { svg: FlexibleMultisigBackgroundSvg, img: FlexibleMultisigBackgroundImg },
   vault: { svg: VaultSvg, img: VaultImg },
   vaultBackground: { svg: VaultBackgroundSvg, img: VaultBackgroundImg },
   vaultOnboarding: { svg: VaultOnboardingSvg, img: VaultOnboardingImg },
diff --git a/src/renderer/widgets/CreateWallet/model/flow-model.ts b/src/renderer/widgets/CreateWallet/model/flow-model.ts
index cc5b0fc5f..0f5c20f5d 100644
--- a/src/renderer/widgets/CreateWallet/model/flow-model.ts
+++ b/src/renderer/widgets/CreateWallet/model/flow-model.ts
@@ -193,7 +193,7 @@ type CreateWalletParams = {
   name: string;
   threshold: number;
   signatories: Signatory[];
-  chainId: ChainId | null;
+  chainId: ChainId;
   isEthereumChain: boolean;
 };
 
@@ -212,11 +212,10 @@ const createWalletFx = createEffect(
       accounts: [
         {
           signatories,
-          chainId: chainId || undefined,
+          chainId,
           name: name.trim(),
           accountId: accountId,
           threshold: threshold,
-          creatorAccountId: accountId,
           cryptoType: isEthereumChain ? CryptoType.ETHEREUM : CryptoType.SR25519,
           chainType: isEthereumChain ? ChainType.ETHEREUM : ChainType.SUBSTRATE,
           type: AccountType.MULTISIG,
diff --git a/src/renderer/widgets/CreateWallet/ui/CreateWalletProvider.tsx b/src/renderer/widgets/CreateWallet/ui/CreateWalletProvider.tsx
index 8ef2a7bb4..5adb181a9 100644
--- a/src/renderer/widgets/CreateWallet/ui/CreateWalletProvider.tsx
+++ b/src/renderer/widgets/CreateWallet/ui/CreateWalletProvider.tsx
@@ -25,6 +25,7 @@ const WalletModals: Record<WalletFamily, (props: ModalProps) => JSX.Element | nu
   [WalletType.MULTISIG]: (props) => <SelectMultisigWalletType isOpen {...props} />,
   [WalletType.WALLET_CONNECT]: (props) => <WalletConnect isOpen {...props} />,
   [WalletType.NOVA_WALLET]: (props) => <NovaWallet isOpen {...props} />,
+  [WalletType.FLEXIBLE_MULTISIG]: () => null,
   [WalletType.PROXIED]: () => null,
 };
 

From b2591d36d2f618d2c7bf2c557ff8eb8ddadf40d2 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravlev <zhuravlev1337@gmail.com>
Date: Tue, 12 Nov 2024 16:11:47 +0100
Subject: [PATCH 2/2] fix: tests

---
 .../model/__tests__/confirm-model.test.ts              |  2 +-
 .../model/__tests__/flexible-multisig-model.test.ts    |  2 +-
 .../model/__tests__/form-model.test.ts                 | 10 +++++-----
 .../model/__tests__/signatory-model.test.ts            |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/renderer/features/flexible-multisig-create/model/__tests__/confirm-model.test.ts b/src/renderer/features/flexible-multisig-create/model/__tests__/confirm-model.test.ts
index db67328ec..31a9a8bf1 100644
--- a/src/renderer/features/flexible-multisig-create/model/__tests__/confirm-model.test.ts
+++ b/src/renderer/features/flexible-multisig-create/model/__tests__/confirm-model.test.ts
@@ -16,7 +16,7 @@ describe('Create flexible multisig wallet confirm-model', () => {
     const scope = fork({
       values: new Map()
         .set(networkModel.$apis, { '0x00': testApi })
-        .set(walletModel.$allWallets, [initiatorWallet, signerWallet]),
+        .set(walletModel._test.$allWallets, [initiatorWallet, signerWallet]),
     });
 
     const store = {
diff --git a/src/renderer/features/flexible-multisig-create/model/__tests__/flexible-multisig-model.test.ts b/src/renderer/features/flexible-multisig-create/model/__tests__/flexible-multisig-model.test.ts
index 1355459b5..eb146552b 100644
--- a/src/renderer/features/flexible-multisig-create/model/__tests__/flexible-multisig-model.test.ts
+++ b/src/renderer/features/flexible-multisig-create/model/__tests__/flexible-multisig-model.test.ts
@@ -41,7 +41,7 @@ describe('Create flexible multisig wallet flexible-multisig', () => {
         .set(networkModel.$apis, { '0x00': testApi })
         .set(networkModel.$chains, { '0x00': testChain })
         .set(networkModel.$connectionStatuses, { '0x00': ConnectionStatus.CONNECTED })
-        .set(walletModel.$allWallets, [initiatorWallet, signerWallet]),
+        .set(walletModel._test.$allWallets, [initiatorWallet, signerWallet]),
     });
     await allSettled(flexibleMultisigFeature.start, { scope });
 
diff --git a/src/renderer/features/flexible-multisig-create/model/__tests__/form-model.test.ts b/src/renderer/features/flexible-multisig-create/model/__tests__/form-model.test.ts
index 73959cab4..85b3a5ca1 100644
--- a/src/renderer/features/flexible-multisig-create/model/__tests__/form-model.test.ts
+++ b/src/renderer/features/flexible-multisig-create/model/__tests__/form-model.test.ts
@@ -33,7 +33,7 @@ describe('Create flexible multisig wallet form-model', () => {
         .set(networkModel.$apis, { '0x00': testApi })
         .set(networkModel.$chains, { '0x00': testChain })
         .set(networkModel.$connectionStatuses, { '0x00': ConnectionStatus.CONNECTED })
-        .set(walletModel.$allWallets, [initiatorWallet, signerWallet]),
+        .set(walletModel._test.$allWallets, [initiatorWallet, signerWallet]),
     });
 
     await allSettled(formModel.$createMultisigForm.fields.name.onChange, { scope, params: '' });
@@ -48,7 +48,7 @@ describe('Create flexible multisig wallet form-model', () => {
         .set(networkModel.$apis, { '0x00': testApi })
         .set(networkModel.$chains, { '0x00': testChain })
         .set(networkModel.$connectionStatuses, { '0x00': ConnectionStatus.CONNECTED })
-        .set(walletModel.$allWallets, [initiatorWallet, signerWallet]),
+        .set(walletModel._test.$allWallets, [initiatorWallet, signerWallet]),
     });
 
     await allSettled(formModel.$createMultisigForm.fields.threshold.onChange, { scope, params: 1 });
@@ -63,7 +63,7 @@ describe('Create flexible multisig wallet form-model', () => {
         .set(networkModel.$apis, { '0x00': testApi })
         .set(networkModel.$chains, { '0x00': testChain })
         .set(networkModel.$connectionStatuses, { '0x00': ConnectionStatus.CONNECTED })
-        .set(walletModel.$allWallets, [initiatorWallet, signerWallet, multisigWallet])
+        .set(walletModel._test.$allWallets, [initiatorWallet, signerWallet, multisigWallet])
         .set(signatoryModel.$signatories, []),
     });
 
@@ -88,7 +88,7 @@ describe('Create flexible multisig wallet form-model', () => {
         .set(networkModel.$apis, { '0x00': testApi })
         .set(networkModel.$chains, { '0x00': testChain })
         .set(networkModel.$connectionStatuses, { '0x00': ConnectionStatus.CONNECTED })
-        .set(walletModel.$allWallets, [initiatorWallet, signerWallet, wrongChainWallet]),
+        .set(walletModel._test.$allWallets, [initiatorWallet, signerWallet, wrongChainWallet]),
     });
 
     await allSettled(formModel.$createMultisigForm.fields.chain.onChange, { scope, params: testChain });
@@ -105,7 +105,7 @@ describe('Create flexible multisig wallet form-model', () => {
         .set(networkModel.$apis, { '0x00': testApi })
         .set(networkModel.$chains, { '0x00': testChain })
         .set(networkModel.$connectionStatuses, { '0x00': ConnectionStatus.CONNECTED })
-        .set(walletModel.$allWallets, [initiatorWallet, signerWallet, multisigWallet])
+        .set(walletModel._test.$allWallets, [initiatorWallet, signerWallet, multisigWallet])
         .set(signatoryModel.$signatories, []),
     });
 
diff --git a/src/renderer/features/flexible-multisig-create/model/__tests__/signatory-model.test.ts b/src/renderer/features/flexible-multisig-create/model/__tests__/signatory-model.test.ts
index c8d7e3b5b..f8cfaabb9 100644
--- a/src/renderer/features/flexible-multisig-create/model/__tests__/signatory-model.test.ts
+++ b/src/renderer/features/flexible-multisig-create/model/__tests__/signatory-model.test.ts
@@ -55,7 +55,7 @@ describe('Create flexible multisig wallet signatory-model', () => {
 
   test('should have correct value for $ownSignatoryWallets', async () => {
     const scope = fork({
-      values: new Map().set(walletModel.$allWallets, [initiatorWallet, signerWallet]),
+      values: new Map().set(walletModel._test.$allWallets, [initiatorWallet, signerWallet]),
     });
 
     await allSettled(signatoryModel.events.changeSignatory, {