Merge branch 'dev' into feat/flexible-final-sign

novasamatech · Dec 27, 2024 · 2f468e6 · 2f468e6
2 parents e6d32e7 + fcc48ca
commit 2f468e6
Show file tree

Hide file tree

Showing 82 changed files with 1,287 additions and 603 deletions.
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -1,5 +1,6 @@
 import '@/app/index.css';
 import '@/app/styles/theme/default.css';
+import './theme/root.css';
 
 import { I18Provider } from '@/shared/i18n';
 import { ThemeProvider } from '@/shared/ui-kit';

diff --git a/.storybook/theme/root.css b/.storybook/theme/root.css
@@ -0,0 +1,3 @@
+html, body {
+  height: 100%;
+}
diff --git a/app.config.js b/app.config.js
@@ -43,6 +43,7 @@ module.exports = {
         RENDERER: 'src/renderer/app/index.tsx',
       },
 
+      APP_ROOT: 'src/renderer/app',
       INDEX_HTML: 'src/renderer/app/index.html',
       RESOURCES: 'src/main/resources',
       DEV_BUILD: 'release/build/',

diff --git a/package.json b/package.json
@@ -76,16 +76,16 @@
     "@polkadot/types": "15.0.2",
     "@polkadot/util": "13.2.3",
     "@polkadot/util-crypto": "13.2.3",
-    "@radix-ui/react-accordion": "1.2.1",
-    "@radix-ui/react-checkbox": "1.1.2",
-    "@radix-ui/react-dialog": "1.1.2",
-    "@radix-ui/react-dropdown-menu": "2.1.2",
-    "@radix-ui/react-popover": "1.1.2",
-    "@radix-ui/react-progress": "1.1.0",
-    "@radix-ui/react-scroll-area": "1.2.1",
-    "@radix-ui/react-select": "2.1.2",
-    "@radix-ui/react-slider": "1.2.1",
-    "@radix-ui/react-tooltip": "1.1.4",
+    "@radix-ui/react-accordion": "1.2.2",
+    "@radix-ui/react-checkbox": "1.1.3",
+    "@radix-ui/react-dialog": "1.1.4",
+    "@radix-ui/react-dropdown-menu": "2.1.4",
+    "@radix-ui/react-popover": "1.1.4",
+    "@radix-ui/react-progress": "1.1.1",
+    "@radix-ui/react-scroll-area": "1.2.0",
+    "@radix-ui/react-select": "2.1.4",
+    "@radix-ui/react-slider": "1.2.2",
+    "@radix-ui/react-tooltip": "1.1.6",
     "@react-spring/web": "9.7.5",
     "@remote-ui/rpc": "^1.4.4",
     "@substrate/connect": "2.1.1",
@@ -205,6 +205,8 @@
     "eslint-plugin-react": "7.37.1",
     "eslint-plugin-unused-imports": "4.1.4",
     "fake-indexeddb": "4.0.2",
+    "favicons": "7.2.0",
+    "favicons-webpack-plugin": "6.0.1",
     "file-loader": "6.2.0",
     "html-webpack-plugin": "5.6.0",
     "husky": "9.1.6",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
diff --git a/public/android-chrome-256x256.png b/public/android-chrome-256x256.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
diff --git a/public/site.webmanifest b/public/site.webmanifest
diff --git a/src/renderer/app/favicon.dev.png b/src/renderer/app/favicon.dev.png
diff --git a/src/renderer/app/favicon.png b/src/renderer/app/favicon.png
diff --git a/src/renderer/app/index.html b/src/renderer/app/index.html
@@ -3,13 +3,7 @@
   <head>
     <meta charset="UTF-8" />
 
-    <link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="./favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="./favicon-16x16.png">
-    <link rel="manifest" href="./site.webmanifest">
-    <link rel="mask-icon" href="./safari-pinned-tab.svg" color="#5bbad5">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="theme-color" content="#ffffff">
 
     <!--    This tag commented on purpose - that's the way to "support" mobile devices-->
     <!--    <meta name="viewport" content="width=device-width, initial-scale=1" />-->
@@ -29,11 +23,6 @@
     <meta name="twitter:image" content="https://framerusercontent.com/assets/1jyzdPx8VawFTKoBm8yig14Flm8.png">
     <!--  <link rel="stylesheet" href="theme/default.css" />-->
     <!--  <link rel="stylesheet" href="theme/dark.css" />  Add when dark theme colors are ready  -->
-    <!--  <meta property="twitter:url" content="https://omni.enterprise" />-->
-    <!--  <meta property="twitter:image" content="%PUBLIC_URL%/og-image.png" />-->
-
-    <!--  <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />-->
-    <!--  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />-->
 
     <!--  TODO: add CSP https://csplite.com/ru/csp216/-->
     <title>Nova Spektr</title>

diff --git a/src/renderer/app/index.tsx b/src/renderer/app/index.tsx
@@ -11,6 +11,7 @@ import { resetFeatureStatuses, updateFeatureStatus } from '@/shared/config/featu
 import { I18Provider } from '@/shared/i18n';
 import { isElectron } from '@/shared/lib/utils';
 import { FallbackScreen } from '@/shared/ui';
+import { ThemeProvider } from '@/shared/ui-kit';
 import { APP_CONFIG } from '../../../app.config';
 
 import { LoadingDelay, controlledLazy, suspenseDelay } from './DelayedSuspense';
@@ -61,16 +62,18 @@ const Root = () => {
   const splashScreen = renderSplashScreen ? isElectron() ? <ElectronSplashScreen /> : <WebSplashScreen /> : null;
 
   return (
-    <HashRouter>
-      <I18Provider>
-        <ErrorBoundary FallbackComponent={FallbackScreen} onError={console.error}>
-          <Suspense fallback={splashScreen}>
-            <App onReady={() => setAppLoaded(true)} />
-            <LoadingDelay suspense={loadingDelay} />
-          </Suspense>
-        </ErrorBoundary>
-      </I18Provider>
-    </HashRouter>
+    <ThemeProvider theme="light" iconStyle="colored">
+      <HashRouter>
+        <I18Provider>
+          <ErrorBoundary FallbackComponent={FallbackScreen} onError={console.error}>
+            <Suspense fallback={splashScreen}>
+              <App onReady={() => setAppLoaded(true)} />
+              <LoadingDelay suspense={loadingDelay} />
+            </Suspense>
+          </ErrorBoundary>
+        </I18Provider>
+      </HashRouter>
+    </ThemeProvider>
   );
 };
 

diff --git a/src/renderer/app/manifest.webmanifest b/src/renderer/app/manifest.webmanifest
@@ -0,0 +1,6 @@
+{
+    "name": "Nova Spektr",
+    "short_name": "Spektr",
+    "display": "standalone",
+    "start_url": "/"
+}
diff --git a/src/renderer/domains/collectives/model/members/service.ts b/src/renderer/domains/collectives/model/members/service.ts
@@ -1,19 +1,19 @@
-import { type Account, type Chain } from '@/shared/core';
+import { type Account, type Chain, type Wallet } from '@/shared/core';
 import { dictionary } from '@/shared/lib/utils';
 import { accountUtils } from '@/entities/wallet';
 
 import { type CoreMember, type Member } from './types';
 
-const findMachingMember = (accounts: Account[], members: Member[], chain: Chain) => {
+const findMatchingMember = (wallet: Wallet, accounts: Account[], chain: Chain, members: Member[]) => {
   const walletAccounts = accounts.filter(account => {
-    return !accountUtils.isBaseAccount(account) && accountUtils.isChainAndCryptoMatch(account, chain);
+    return accountUtils.isNonBaseVaultAccount(account, wallet) && accountUtils.isChainAndCryptoMatch(account, chain);
   });
   const accountsDictionary = dictionary(walletAccounts, 'accountId');
 
   return members.find(member => member.accountId in accountsDictionary) ?? null;
 };
 
-const findMachingAccount = (accounts: Account[], member: Member) => {
+const findMatchingAccount = (accounts: Account[], member: Member) => {
   return accounts.find(a => a.accountId === member.accountId) ?? null;
 };
 
@@ -26,7 +26,7 @@ const isCoreMember = (member: Member | CoreMember): member is CoreMember => {
 };
 
 export const membersService = {
-  findMachingMember,
-  findMachingAccount,
+  findMatchingMember,
+  findMatchingAccount,
   isCoreMember,
 };
diff --git a/src/renderer/domains/identity/model/identity/model.ts b/src/renderer/domains/identity/model/identity/model.ts
@@ -1,5 +1,5 @@
 import { type ApiPromise } from '@polkadot/api';
-import { createEvent, sample } from 'effector';
+import { attach } from 'effector';
 
 import { type ChainId } from '@/shared/core';
 import { createDataSource } from '@/shared/effector';
@@ -27,6 +27,7 @@ type InnerRequestParams = {
 const {
   $: $list,
   request: requestIdentity,
+  fulfilled,
   pending,
   fail,
 } = createDataSource<IdentityStore, InnerRequestParams, IdentityData>({
@@ -73,15 +74,10 @@ const {
 
 const { $apis, $chains } = networkModel;
 
-const request = createEvent<RequestParams>();
-
-sample({
-  clock: request,
-  source: {
-    apis: $apis,
-    chains: $chains,
-  },
-  fn: ({ apis, chains }, { chainId, accounts }) => {
+const request = attach({
+  effect: requestIdentity,
+  source: { apis: $apis, chains: $chains },
+  mapParams: ({ chainId, accounts }: RequestParams, { apis, chains }) => {
     const identityChain = identityService.findIdentityChain(chains, chainId);
     if (nullable(identityChain)) {
       throw new Error(`Chain path from ${chainId} is broken, trace chain.parentId fields in config.`);
@@ -98,11 +94,11 @@ sample({
       api,
     };
   },
-  target: requestIdentity,
 });
 
 export const identityDomainModel = {
   $list,
+  $fulfilled: fulfilled,
   request,
   pending,
   fail,

diff --git a/src/renderer/entities/transaction/lib/callDataDecoder.ts b/src/renderer/entities/transaction/lib/callDataDecoder.ts
@@ -230,6 +230,15 @@ export const useCallDataDecoder = (): ICallDataDecoder => {
 
       return xcmService.decodeXcm(chainId, parsedData);
     },
+    [TransactionType.POLKADOT_XCM_TRANSFER_ASSETS]: (decoded, chainId): Record<string, any> => {
+      const parsedData = xcmService.parseXcmPalletExtrinsic({
+        dest: decoded.args[0].toHuman(),
+        beneficiary: decoded.args[1].toHuman(),
+        assets: decoded.args[2].toHuman(),
+      });
+
+      return xcmService.decodeXcm(chainId, parsedData);
+    },
     [TransactionType.XTOKENS_TRANSFER_MULTIASSET]: (decoded, chainId): Record<string, any> => {
       const parsedData = xcmService.parseXTokensExtrinsic({
         asset: decoded.args[0].toHuman(),

diff --git a/src/renderer/entities/transaction/lib/common/constants.ts b/src/renderer/entities/transaction/lib/common/constants.ts
@@ -40,6 +40,7 @@ export const XcmTypes = [
   TransactionType.XCM_LIMITED_TRANSFER,
   TransactionType.POLKADOT_XCM_TELEPORT,
   TransactionType.POLKADOT_XCM_LIMITED_TRANSFER,
+  TransactionType.POLKADOT_XCM_TRANSFER_ASSETS,
   TransactionType.XTOKENS_TRANSFER_MULTIASSET,
 ];
 
@@ -53,6 +54,7 @@ export type XcmTransactionTypes =
   | TransactionType.XCM_LIMITED_TRANSFER
   | TransactionType.POLKADOT_XCM_TELEPORT
   | TransactionType.POLKADOT_XCM_LIMITED_TRANSFER
+  | TransactionType.POLKADOT_XCM_TRANSFER_ASSETS
   | TransactionType.XTOKENS_TRANSFER_MULTIASSET;
 
 export type MultisigTransactionTypes =

diff --git a/src/renderer/entities/transaction/lib/common/utils.ts b/src/renderer/entities/transaction/lib/common/utils.ts
@@ -147,7 +147,9 @@ export const findCoreBatchAll = (coreTx: Transaction | DecodedTransaction): Tran
     return coreTx.args?.transactions?.find((t: Transaction) => t.type === TransactionType.UNLOCK) || coreTx;
   }
 
-  return coreTx.args?.transactions?.find((tx: Transaction) => isWrappedInBatchAll(tx.type));
+  const supportedTransaction = coreTx.args?.transactions?.find((tx: Transaction) => isWrappedInBatchAll(tx.type));
+
+  return supportedTransaction || coreTx.args?.transactions?.[0];
 };
 
 export const getTransactionAmount = (tx: Transaction | DecodedTransaction): string | null => {
@@ -231,6 +233,7 @@ const TransactionTitles: Record<TransactionType, string> = {
   [TransactionType.XCM_TELEPORT]: 'operations.titles.crossChainTransfer',
   [TransactionType.POLKADOT_XCM_LIMITED_TRANSFER]: 'operations.titles.crossChainTransfer',
   [TransactionType.POLKADOT_XCM_TELEPORT]: 'operations.titles.crossChainTransfer',
+  [TransactionType.POLKADOT_XCM_TRANSFER_ASSETS]: 'operations.titles.crossChainTransfer',
   [TransactionType.XTOKENS_TRANSFER_MULTIASSET]: 'operations.titles.crossChainTransfer',
   // Staking
   [TransactionType.BOND]: 'operations.titles.startStaking',
@@ -242,7 +245,7 @@ const TransactionTitles: Record<TransactionType, string> = {
   [TransactionType.UNSTAKE]: 'operations.titles.unstake',
   // Technical
   [TransactionType.CHILL]: 'operations.titles.unstake',
-  [TransactionType.BATCH_ALL]: 'operations.titles.unknown',
+  [TransactionType.BATCH_ALL]: 'operations.titles.batchAll',
   // Proxy
   [TransactionType.ADD_PROXY]: 'operations.titles.addProxy',
   [TransactionType.CREATE_PURE_PROXY]: 'operations.titles.createPureProxy',
@@ -283,6 +286,8 @@ const TransactionTitlesModal: Record<TransactionType, (crossChain: boolean) => s
     `operations.modalTitles.${crossChain ? 'transferFrom' : 'transferOn'}`,
   [TransactionType.POLKADOT_XCM_TELEPORT]: (crossChain) =>
     `operations.modalTitles.${crossChain ? 'transferFrom' : 'transferOn'}`,
+  [TransactionType.POLKADOT_XCM_TRANSFER_ASSETS]: (crossChain) =>
+    `operations.modalTitles.${crossChain ? 'transferFrom' : 'transferOn'}`,
   [TransactionType.XTOKENS_TRANSFER_MULTIASSET]: (crossChain) =>
     `operations.modalTitles.${crossChain ? 'transferFrom' : 'transferOn'}`,
   // Staking
@@ -355,7 +360,9 @@ export const getModalTransactionTitle = (
   }
 
   if (transaction.type === TransactionType.BATCH_ALL) {
-    return getModalTransactionTitle(crossChain, t, transaction.args?.transactions?.[0]);
+    const txMatch = findCoreBatchAll(transaction);
+
+    return getModalTransactionTitle(crossChain, t, txMatch);
   }
 
   if (transaction.type === TransactionType.PROXY) {

diff --git a/src/renderer/entities/transaction/lib/common/xcmMethods.ts b/src/renderer/entities/transaction/lib/common/xcmMethods.ts
@@ -45,6 +45,25 @@ export function limitedTeleportAssets(
   );
 }
 
+export function transferAssets(
+  pallet: XcmPallet,
+  args: XcmPalletTransferArgs,
+  info: BaseTxInfo,
+  options: OptionsWithMeta,
+): UnsignedTransaction {
+  return defineMethod(
+    {
+      method: {
+        args,
+        name: 'transferAssets',
+        pallet,
+      },
+      ...info,
+    },
+    options,
+  );
+}
+
 export function transferMultiAsset(
   args: XTokenPalletTransferArgs,
   info: BaseTxInfo,

diff --git a/src/renderer/entities/transaction/lib/extrinsicService.ts b/src/renderer/entities/transaction/lib/extrinsicService.ts
@@ -199,6 +199,20 @@ export const getUnsignedTransaction: Record<
       options,
     );
   },
+  [TransactionType.POLKADOT_XCM_TRANSFER_ASSETS]: (transaction, info, options) => {
+    return xcmMethods.transferAssets(
+      'polkadotXcm',
+      {
+        dest: transaction.args.xcmDest,
+        beneficiary: transaction.args.xcmBeneficiary,
+        assets: transaction.args.xcmAsset,
+        feeAssetItem: DEFAULT_FEE_ASSET_ITEM,
+        weightLimit: { Unlimited: true },
+      },
+      info,
+      options,
+    );
+  },
   [TransactionType.XTOKENS_TRANSFER_MULTIASSET]: (transaction, info, options) => {
     return xcmMethods.transferMultiAsset(
       {
@@ -527,6 +541,11 @@ export const getExtrinsic: Record<
       Unlimited: true,
     });
   },
+  [TransactionType.POLKADOT_XCM_TRANSFER_ASSETS]: ({ xcmDest, xcmBeneficiary, xcmAsset }, api) => {
+    return api.tx.polkadotXcm.transferAssets(xcmDest, xcmBeneficiary, xcmAsset, DEFAULT_FEE_ASSET_ITEM, {
+      Unlimited: true,
+    });
+  },
   [TransactionType.XTOKENS_TRANSFER_MULTIASSET]: ({ xcmDest, xcmAsset, xcmWeight }, api) => {
     const weight = hasDestWeight(api) ? xcmWeight : { Unlimited: true };
 

diff --git a/src/renderer/entities/transaction/lib/transactionConfirmIcon.ts b/src/renderer/entities/transaction/lib/transactionConfirmIcon.ts
@@ -16,6 +16,7 @@ const TransactionIcons: Record<TransactionType, IconNames> = {
   [TransactionType.XCM_TELEPORT]: 'crossChainConfirm',
   [TransactionType.POLKADOT_XCM_LIMITED_TRANSFER]: 'crossChainConfirm',
   [TransactionType.POLKADOT_XCM_TELEPORT]: 'crossChainConfirm',
+  [TransactionType.POLKADOT_XCM_TRANSFER_ASSETS]: 'crossChainConfirm',
   [TransactionType.XTOKENS_TRANSFER_MULTIASSET]: 'crossChainConfirm',
   // Staking
   [TransactionType.BOND]: 'startStakingConfirm',