+
);
diff --git a/src/renderer/shared/api/balances/service/balanceService.ts b/src/renderer/shared/api/balances/service/balanceService.ts
index 49786c3455..d8fa934b20 100644
--- a/src/renderer/shared/api/balances/service/balanceService.ts
+++ b/src/renderer/shared/api/balances/service/balanceService.ts
@@ -157,7 +157,7 @@ function subscribeStatemineAssetsChange(
throw new Error(`Pallet ${pallet} not found.`);
}
- const type = api.tx.foreignAssets.transfer.meta.args[0].type;
+ const type = api.tx[pallet]?.transfer.meta.args[0].type;
if (nullable(type)) {
return Promise.resolve(noop);
}
diff --git a/src/renderer/shared/api/xcm/__tests__/xcm-utils.test.ts b/src/renderer/shared/api/xcm/__tests__/xcm-utils.test.ts
index 3cace57ce3..b1359514db 100644
--- a/src/renderer/shared/api/xcm/__tests__/xcm-utils.test.ts
+++ b/src/renderer/shared/api/xcm/__tests__/xcm-utils.test.ts
@@ -37,28 +37,54 @@ describe('shared/api/xcm/lib/xcm-utils', () => {
});
test('should calculate correct location for sibling prachain', () => {
- const location = xcmUtils.getDestinationLocation({ parentId: '0x00' }, 2000) as any;
+ const location = xcmUtils.getDestinationLocation('V2', { parentId: '0x00' }, 2000) as any;
expect(location.parents).toEqual(1);
- expect(location.interior.X1[0].Parachain).toEqual(2000);
+ expect(location.interior.X1.Parachain).toEqual(2000);
});
test('should calculate correct location for parent parachain', () => {
- const location = xcmUtils.getDestinationLocation({ parentId: '0x00' }) as any;
+ const location = xcmUtils.getDestinationLocation('V2', { parentId: '0x00' }) as any;
expect(location.parents).toEqual(1);
expect(location.interior).toEqual('Here');
});
test('should calculate correct address location for parent parachain', () => {
- const location = xcmUtils.getDestinationLocation({ parentId: '0x00' }, undefined, '0x00') as any;
+ const location = xcmUtils.getDestinationLocation('V2', { parentId: '0x00' }, undefined, '0x00') as any;
+
+ expect(location.parents).toEqual(1);
+ expect(location.interior.X1.AccountId32.id).toEqual('0x00');
+ });
+
+ test('should calculate correct address location for parent parachain V4', () => {
+ const location = xcmUtils.getDestinationLocation('V4', { parentId: '0x00' }, undefined, '0x00') as any;
expect(location.parents).toEqual(1);
expect(location.interior.X1[0].AccountId32.id).toEqual('0x00');
});
+ test('should calculate correct address location for parent parachain V4', () => {
+ const location = xcmUtils.getDestinationLocation(
+ 'V4',
+ { parentId: '0x00' },
+ undefined,
+ '0x3da9ea1622ee74cf87144e3d2c7f7cce4d167d9c',
+ ) as any;
+
+ expect(location.parents).toEqual(1);
+ expect(location.interior.X1[0].AccountKey20.key).toEqual('0x3da9ea1622ee74cf87144e3d2c7f7cce4d167d9c');
+ });
+
test('should calculate correct location for child parachain', () => {
- const location = xcmUtils.getDestinationLocation({ parentId: undefined }, 2000) as any;
+ const location = xcmUtils.getDestinationLocation('V2', { parentId: undefined }, 2000) as any;
+
+ expect(location.parents).toEqual(0);
+ expect(location.interior.X1.Parachain).toEqual(2000);
+ });
+
+ test('should calculate correct location for child parachain V4', () => {
+ const location = xcmUtils.getDestinationLocation('V4', { parentId: undefined }, 2000) as any;
expect(location.parents).toEqual(0);
expect(location.interior.X1[0].Parachain).toEqual(2000);
diff --git a/src/renderer/shared/api/xcm/lib/types.ts b/src/renderer/shared/api/xcm/lib/types.ts
index 3b21c94f55..4bcf8d3340 100644
--- a/src/renderer/shared/api/xcm/lib/types.ts
+++ b/src/renderer/shared/api/xcm/lib/types.ts
@@ -87,6 +87,7 @@ export const enum XcmTransferType {
XTOKENS = 'xtokens',
XCMPALLET = 'xcmpallet',
XCMPALLET_TELEPORT = 'xcmpallet-teleport',
+ XCMPALLET_TRANSFER_ASSETS = 'xcmpallet-transferAssets',
}
export type PathType = 'absolute' | 'relative' | 'concrete';
diff --git a/src/renderer/shared/api/xcm/lib/xcm-utils.ts b/src/renderer/shared/api/xcm/lib/xcm-utils.ts
index 4a95cf3359..9af057dd53 100644
--- a/src/renderer/shared/api/xcm/lib/xcm-utils.ts
+++ b/src/renderer/shared/api/xcm/lib/xcm-utils.ts
@@ -100,11 +100,19 @@ function sortJunctions(a: JunctionTypeKey, b: JunctionTypeKey): number {
return JunctionHierarchyLevel[a] - JunctionHierarchyLevel[b];
}
-function createJunctionFromObject(data: Record
) {
+function createJunctionFromObject(version: string, data: Record) {
const entries = Object.entries(data);
if (entries.length === 0) return 'Here';
+ if (['V2', 'V3'].includes(version) && entries.length === 1) {
+ return {
+ X1: {
+ [JunctionType[entries[0][0] as JunctionTypeKey]]: entries[0][1],
+ },
+ };
+ }
+
return {
[`X${entries.length}`]: entries
.sort((a, b) => sortJunctions(a[0], b[0]))
@@ -114,52 +122,53 @@ function createJunctionFromObject(data: Record) {
};
}
-function getRelativeAssetLocation(assetLocation?: LocalMultiLocation) {
+function getRelativeAssetLocation(version: string, assetLocation?: LocalMultiLocation) {
if (!assetLocation) return;
const { parachainId: _, ...location } = assetLocation;
return {
parents: 0,
- interior: createJunctionFromObject(location),
+ interior: createJunctionFromObject(version, location),
};
}
-function getAbsoluteAssetLocation(assetLocation?: LocalMultiLocation) {
+function getAbsoluteAssetLocation(version: string, assetLocation?: LocalMultiLocation) {
if (!assetLocation) return;
return {
parents: 1,
- interior: createJunctionFromObject(assetLocation),
+ interior: createJunctionFromObject(version, assetLocation),
};
}
-function getConcreteAssetLocation(assetLocation?: LocalMultiLocation) {
+function getConcreteAssetLocation(version: string, assetLocation?: LocalMultiLocation) {
if (!assetLocation) return;
const { parents, ...location } = assetLocation;
return {
parents,
- interior: createJunctionFromObject(location),
+ interior: createJunctionFromObject(version, location),
};
}
function getDestinationLocation(
+ version: string,
originChain: Pick,
destinationParaId?: number,
accountId?: AccountId,
) {
if (originChain.parentId && destinationParaId) {
- return getSiblingLocation(destinationParaId, accountId);
+ return getSiblingLocation(version, destinationParaId, accountId);
}
if (originChain.parentId) {
- return getParentLocation(accountId);
+ return getParentLocation(version, accountId);
}
if (destinationParaId) {
- return getChildLocation(destinationParaId, accountId);
+ return getChildLocation(version, destinationParaId, accountId);
}
return undefined;
@@ -183,7 +192,7 @@ function getAccountLocation(accountId?: AccountId) {
};
}
-function getChildLocation(parachainId: number, accountId?: AccountId) {
+function getChildLocation(version: string, parachainId: number, accountId?: AccountId) {
const location: Record = { parachainId };
const isEthereum = isEthereumAccountId(accountId);
@@ -196,11 +205,11 @@ function getChildLocation(parachainId: number, accountId?: AccountId) {
return {
parents: 0,
- interior: createJunctionFromObject(location),
+ interior: createJunctionFromObject(version, location),
};
}
-function getParentLocation(accountId?: AccountId) {
+function getParentLocation(version: string, accountId?: AccountId) {
const location: Record = {};
const isEthereum = isEthereumAccountId(accountId);
@@ -213,11 +222,11 @@ function getParentLocation(accountId?: AccountId) {
return {
parents: 1,
- interior: createJunctionFromObject(location),
+ interior: createJunctionFromObject(version, location),
};
}
-function getSiblingLocation(parachainId: number, accountId?: AccountId) {
+function getSiblingLocation(version: string, parachainId: number, accountId?: AccountId) {
const location: Record = { parachainId };
const isEthereum = isEthereumAccountId(accountId);
@@ -230,7 +239,7 @@ function getSiblingLocation(parachainId: number, accountId?: AccountId) {
return {
parents: 1,
- interior: createJunctionFromObject(location),
+ interior: createJunctionFromObject(version, location),
};
}
diff --git a/src/renderer/shared/api/xcm/service/xcmService.ts b/src/renderer/shared/api/xcm/service/xcmService.ts
index f732621fb5..6076f2efa7 100644
--- a/src/renderer/shared/api/xcm/service/xcmService.ts
+++ b/src/renderer/shared/api/xcm/service/xcmService.ts
@@ -118,28 +118,46 @@ function getEstimatedRequiredDestWeight(
return weight.gte(reserveWeight) ? weight : reserveWeight;
}
+function getFixedVersion(location: string) {
+ return {
+ // TODO: check Interlay transfer later
+ INTR: 'V2',
+ }[location];
+}
+
function getAssetLocation(
api: ApiPromise,
transferType: XcmTransferType,
asset: AssetXCM,
- assets: Record,
+ assetsConfig: Record,
amount: BN,
isArray = true,
): NonNullable | undefined {
+ const type = getTypeName(api, transferType, isArray ? 'assets' : 'asset');
+ const assetVersionType = getFixedVersion(asset.assetLocation) || getTypeVersion(api, type || '');
+
const PathMap: Record NonNullable | undefined> = {
- relative: () => xcmUtils.getRelativeAssetLocation(assets[asset.assetLocation].multiLocation),
- absolute: () => xcmUtils.getAbsoluteAssetLocation(assets[asset.assetLocation].multiLocation),
- concrete: () => xcmUtils.getConcreteAssetLocation(asset.assetLocationPath.path),
+ relative: () =>
+ xcmUtils.getRelativeAssetLocation(assetVersionType, assetsConfig[asset.assetLocation].multiLocation),
+ absolute: () =>
+ xcmUtils.getAbsoluteAssetLocation(assetVersionType, assetsConfig[asset.assetLocation].multiLocation),
+ concrete: () => xcmUtils.getConcreteAssetLocation(assetVersionType, asset.assetLocationPath.path),
};
const location = PathMap[asset.assetLocationPath.type]();
- const type = getTypeName(api, transferType, isArray ? 'assets' : 'asset');
- const assetVersionType = getTypeVersion(api, type || '');
- const assetObject = {
- id: {
+ let id;
+
+ if (['V2', 'V3'].includes(assetVersionType)) {
+ id = {
Concrete: location,
- },
+ };
+ } else {
+ id = location;
+ }
+
+ const assetObject = {
+ id,
fun: {
Fungible: amount.toString(),
},
@@ -157,7 +175,7 @@ function getVersionedDestinationLocation(
) {
const type = getTypeName(api, transferType, 'dest');
const version = getTypeVersion(api, type || '');
- const location = xcmUtils.getDestinationLocation(originChain, destinationParaId, accountId);
+ const location = xcmUtils.getDestinationLocation(version, originChain, destinationParaId, accountId);
if (!version) return location;
diff --git a/src/renderer/shared/core/types/transaction.ts b/src/renderer/shared/core/types/transaction.ts
index 7c246bf69b..502b4817bb 100644
--- a/src/renderer/shared/core/types/transaction.ts
+++ b/src/renderer/shared/core/types/transaction.ts
@@ -16,6 +16,7 @@ export const enum TransactionType {
XCM_TELEPORT = 'xcm_limited_teleport_assets',
POLKADOT_XCM_LIMITED_TRANSFER = 'polkadotxcm_limited_reserve_transfer_assets',
POLKADOT_XCM_TELEPORT = 'polkadotxcm_limited_teleport_assets',
+ POLKADOT_XCM_TRANSFER_ASSETS = 'polkadotxcm_transfer_assets',
XTOKENS_TRANSFER_MULTIASSET = 'xtokens_transfer_multiasset',
BOND = 'bond',
diff --git a/src/renderer/shared/i18n/locales/en.json b/src/renderer/shared/i18n/locales/en.json
index 909f631b5a..4ab6df84bd 100644
--- a/src/renderer/shared/i18n/locales/en.json
+++ b/src/renderer/shared/i18n/locales/en.json
@@ -307,6 +307,9 @@
"reloadButton": "Refresh"
},
"fellowship": {
+ "details": {
+ "noDetails": "Details not found"
+ },
"errors": {
"disconnect": {
"action": "Open network settings",
@@ -322,22 +325,7 @@
"modalAccountTitle": "Account",
"modalTitle": "Fellowship members"
},
- "voting": {
- "voted": "Voted:",
- "errors": {
- "rankThreshold": "You cannot vote in this referendum because your rank is below the required level."
- },
- "votingStatus": "Voting status",
- "summary": "Summary",
- "title": "Vote on",
- "threshold": "Threshold",
- "aye": "Aye",
- "nay": "Nay",
- "confirmation": {
- "vote": "Vote",
- "fee": "Fee"
- }
- },
+ "noAccount": "Account not found",
"noProfile": "Profile doesn’t exist",
"referendums": {
"tracks": {
@@ -365,14 +353,35 @@
}
},
"title": "Fellowship",
- "yourProfile": "Your profile",
+ "tooltips": {
+ "noProfile": "You are not a fellowship member",
+ "noAccount": "Please add or create account to the { chain } network"
+ },
+ "voting": {
+ "voted": "Voted:",
+ "errors": {
+ "rankThreshold": "You cannot vote in this referendum because your rank is below the required level."
+ },
+ "votingStatus": "Voting status",
+ "summary": "Summary",
+ "title": "Vote on",
+ "threshold": "Threshold",
+ "aye": "Aye",
+ "nay": "Nay",
+ "confirmation": {
+ "vote": "Vote",
+ "fee": "Fee"
+ }
+ },
"votingHistory": {
"modalTitle": "Vote history",
"votes_one": "{count} vote",
"votes_other": "{count} votes",
"showHistoryButton": "View vote history",
- "emptyList": "There is no vote history"
- }
+ "emptyList": "There is no vote history",
+ "votingPowerDescription": "Voting power is a number of votes calculated based on the member's rank."
+ },
+ "yourProfile": "Your profile"
},
"general": {
"actions": {
@@ -1085,6 +1094,7 @@
"titles": {
"addProxy": "Add delegated authority (proxy)",
"approveMultisig": "Approve multisig operation",
+ "batchAll": "Batch All",
"createPureProxy": "Create pure proxy",
"crossChainTransfer": "Cross-chain transfer",
"delegate": "Delegate",
diff --git a/src/renderer/shared/lib/utils/__tests__/arrays.test.ts b/src/renderer/shared/lib/utils/__tests__/arrays.test.ts
index e4d7d7f8aa..e12b233288 100644
--- a/src/renderer/shared/lib/utils/__tests__/arrays.test.ts
+++ b/src/renderer/shared/lib/utils/__tests__/arrays.test.ts
@@ -60,7 +60,7 @@ describe('merge', () => {
expect(res).toEqual(['1', '2', '3', '4', '5']);
});
- it('should return first array if second is empty', () => {
+ test('should return first array if second is empty', () => {
const list1 = ['1', '2', '3', '4'];
const res = merge({
@@ -120,7 +120,7 @@ describe('merge', () => {
expect(res).toEqual([{ id: 1, v: 3 }, { id: 3 }, { id: 5 }]);
});
- it('should replace and sort objects', () => {
+ test('should replace and sort objects', () => {
const list1 = [{ id: 1 }, { id: 5 }, { id: 4 }];
const list2 = [{ id: 3 }, { id: 2 }];
@@ -238,7 +238,7 @@ describe('dictionary', () => {
});
describe('groupBy', () => {
- it('should group', () => {
+ test('should group', () => {
const list = [
{ type: 'a', v: 1 },
{ type: 'b', v: 1 },
diff --git a/src/renderer/shared/lib/utils/substrate.ts b/src/renderer/shared/lib/utils/substrate.ts
index 81f08c71b2..4f5cd31e68 100644
--- a/src/renderer/shared/lib/utils/substrate.ts
+++ b/src/renderer/shared/lib/utils/substrate.ts
@@ -26,7 +26,7 @@ import { DEFAULT_TIME, ONE_DAY, THRESHOLD } from './constants';
export type TxMetadata = { registry: TypeRegistry; options: OptionsWithMeta; info: BaseTxInfo };
-const SUPPORTED_VERSIONS = ['V3', 'V4'];
+const SUPPORTED_VERSIONS = ['V2', 'V3', 'V4'];
const UNUSED_LABEL = 'unused';
/**
@@ -180,7 +180,7 @@ export const getTypeVersion = (api: ApiPromise, typeName: string): string => {
const enumValues = getTypeEnumValues(api, typeName);
const supportedVersions = enumValues.filter((value) => SUPPORTED_VERSIONS.includes(value));
- return supportedVersions.pop() || '';
+ return supportedVersions.at(-1) || '';
};
export const getProxyTypes = (api: ApiPromise): ProxyType[] => {
@@ -227,6 +227,10 @@ export const getPalletAndCallByXcmTransferType = (
return { pallet, call: 'limitedTeleportAssets' };
}
+ if (transferType === XcmTransferType.XCMPALLET_TRANSFER_ASSETS) {
+ return { pallet, call: 'transferAssets' };
+ }
+
// Should never be reached as all transferType cases are covered
throw new Error('Invalid transferType');
};
diff --git a/src/renderer/shared/ui-kit/Carousel/Carousel.tsx b/src/renderer/shared/ui-kit/Carousel/Carousel.tsx
index 1cea7a779c..e0de6a3bdc 100644
--- a/src/renderer/shared/ui-kit/Carousel/Carousel.tsx
+++ b/src/renderer/shared/ui-kit/Carousel/Carousel.tsx
@@ -105,7 +105,7 @@ const Item = memo(({ id, children }: ItemProps) => {
return transitions((styles, item) =>
item ? (
-
+
{children}
) : null,
@@ -125,7 +125,10 @@ const AnimatedResizableBlock = ({ children }: PropsWithChildren) => {
});
return (
-
+
);
diff --git a/src/renderer/shared/ui-kit/Input/Input.tsx b/src/renderer/shared/ui-kit/Input/Input.tsx
index b3ea2b153b..627208dd0b 100644
--- a/src/renderer/shared/ui-kit/Input/Input.tsx
+++ b/src/renderer/shared/ui-kit/Input/Input.tsx
@@ -28,7 +28,7 @@ export const Input = forwardRef(
(
{
type = 'text',
- height = 'md',
+ height = 'sm',
name,
value,
placeholder,
diff --git a/src/renderer/shared/ui-kit/Modal/Modal.tsx b/src/renderer/shared/ui-kit/Modal/Modal.tsx
index 086b3aef43..99c2796700 100644
--- a/src/renderer/shared/ui-kit/Modal/Modal.tsx
+++ b/src/renderer/shared/ui-kit/Modal/Modal.tsx
@@ -96,9 +96,17 @@ const Title = ({ action, close, children }: TitleProps) => {
);
};
+const HeaderContent = ({ children }: PropsWithChildren) => {
+ return (
+
+ );
+};
+
const Content = ({ disableScroll, children }: PropsWithChildren<{ disableScroll?: boolean }>) => {
return disableScroll ? (
- {children}
+ {children}
) : (
{children}
);
@@ -115,6 +123,7 @@ const Footer = ({ children }: PropsWithChildren) => {
export const Modal = Object.assign(Root, {
Trigger,
Title,
+ HeaderContent,
Content,
Footer,
});
diff --git a/src/renderer/shared/ui-kit/Theme/ThemeProvider.tsx b/src/renderer/shared/ui-kit/Theme/ThemeProvider.tsx
index 3da7f1d739..17cb869a7b 100644
--- a/src/renderer/shared/ui-kit/Theme/ThemeProvider.tsx
+++ b/src/renderer/shared/ui-kit/Theme/ThemeProvider.tsx
@@ -25,7 +25,7 @@ export const ThemeProvider = ({ bodyAsPortalContainer, iconStyle, theme, childre
return (
{children}
-
+
);
};
diff --git a/src/renderer/shared/ui-kit/Tooltip/Tooltip.tsx b/src/renderer/shared/ui-kit/Tooltip/Tooltip.tsx
index 7ca64900d6..a756397849 100644
--- a/src/renderer/shared/ui-kit/Tooltip/Tooltip.tsx
+++ b/src/renderer/shared/ui-kit/Tooltip/Tooltip.tsx
@@ -30,7 +30,7 @@ const Root = ({
onToggle,
children,
side = 'top',
- sideOffset = 2,
+ sideOffset = 1,
align = 'center',
alignOffset = 0,
testId = 'Tooltip',
diff --git a/src/renderer/shared/ui/Inputs/Input/Input.tsx b/src/renderer/shared/ui/Inputs/Input/Input.tsx
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/renderer/shared/ui/Inputs/SearchInput/SearchInput.tsx b/src/renderer/shared/ui/Inputs/SearchInput/SearchInput.tsx
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/renderer/shared/ui/Modals/BaseModal/BaseModal.tsx b/src/renderer/shared/ui/Modals/BaseModal/BaseModal.tsx
index d40a5338cc..a61f74aeba 100644
--- a/src/renderer/shared/ui/Modals/BaseModal/BaseModal.tsx
+++ b/src/renderer/shared/ui/Modals/BaseModal/BaseModal.tsx
@@ -2,6 +2,7 @@ import * as Dialog from '@radix-ui/react-dialog';
import { type PropsWithChildren, type ReactNode } from 'react';
import { cnTw } from '@/shared/lib/utils';
+import { useTheme } from '@/shared/ui-kit/Theme/useTheme';
import { IconButton } from '../../Buttons';
import { HeaderTitleText } from '../../Typography';
@@ -16,6 +17,7 @@ type Props = {
closeButton?: boolean;
actionButton?: ReactNode;
onClose: () => void;
+ testId?: string;
};
/**
@@ -33,12 +35,14 @@ export const BaseModal = ({
children,
panelStyle,
onClose,
+ testId = 'BaseModal',
}: PropsWithChildren) => {
+ const { portalContainer } = useTheme();
const headerExist = title || actionButton || closeButton;
return (
!open && onClose()}>
-
+
{headerExist && (
diff --git a/src/renderer/shared/ui/Modals/StatusModal/StatusModal.stories.tsx b/src/renderer/shared/ui/Modals/StatusModal/StatusModal.stories.tsx
new file mode 100644
index 0000000000..2c5c6b4cf0
--- /dev/null
+++ b/src/renderer/shared/ui/Modals/StatusModal/StatusModal.stories.tsx
@@ -0,0 +1,51 @@
+import { type Meta, type StoryObj } from '@storybook/react';
+
+import { Animation } from '../../Animation/Animation';
+import { Button } from '../../Buttons';
+
+import { StatusModal } from './StatusModal';
+
+const meta: Meta = {
+ title: 'v1/ui/StatusModal',
+ component: StatusModal,
+ parameters: { actions: { argTypesRegex: '^on.*' } },
+};
+
+export default meta;
+
+type Story = StoryObj;
+
+export const Default: Story = {
+ args: {
+ isOpen: true,
+ title: 'Status modal example',
+ onClose: () => {},
+ },
+};
+
+export const WithContent: Story = {
+ args: {
+ isOpen: true,
+ title: 'Status modal example',
+ content: ,
+ onClose: () => {},
+ },
+};
+
+export const WithFooter: Story = {
+ args: {
+ isOpen: true,
+ title: 'Status modal example',
+ children: (
+ <>
+
+
+
+ ),
+ onClose: () => {},
+ },
+};
diff --git a/src/renderer/shared/ui/Modals/StatusModal/StatusModal.tsx b/src/renderer/shared/ui/Modals/StatusModal/StatusModal.tsx
index b85a7f91f4..86c7c250bc 100644
--- a/src/renderer/shared/ui/Modals/StatusModal/StatusModal.tsx
+++ b/src/renderer/shared/ui/Modals/StatusModal/StatusModal.tsx
@@ -1,10 +1,9 @@
-import { Dialog, Transition } from '@headlessui/react';
-import { Fragment, type PropsWithChildren, type ReactNode } from 'react';
+import * as Dialog from '@radix-ui/react-dialog';
+import { type PropsWithChildren, type ReactNode } from 'react';
import { cnTw } from '@/shared/lib/utils';
import { FootnoteText, SmallTitleText } from '../../Typography';
-import { ModalBackdrop } from '../common/ModalBackdrop';
-import { ModalTransition } from '../common/ModalTransition';
+import { BaseModal } from '../BaseModal/BaseModal';
type Props = {
content?: ReactNode;
@@ -14,6 +13,7 @@ type Props = {
zIndex?: string;
onClose: () => void;
className?: string;
+ testId?: string;
};
export const StatusModal = ({
@@ -25,38 +25,35 @@ export const StatusModal = ({
className,
children,
onClose,
+ testId = 'StatusModal',
}: PropsWithChildren) => {
return (
-
-
-
+ {children && {children}
}
+
);
};
diff --git a/src/renderer/shared/ui/Popovers/Popover/Popover.tsx b/src/renderer/shared/ui/Popovers/Popover/Popover.tsx
index 7881762bb5..26a5a2694d 100644
--- a/src/renderer/shared/ui/Popovers/Popover/Popover.tsx
+++ b/src/renderer/shared/ui/Popovers/Popover/Popover.tsx
@@ -5,6 +5,7 @@ import { createPortal } from 'react-dom';
import { useDebounce } from '@/shared/lib/hooks';
import { cnTw } from '@/shared/lib/utils';
+import { useTheme } from '@/shared/ui-kit/Theme/useTheme';
import { type Horizontal, type Vertical } from '../common/types';
import { useParentScrollLock } from '../common/useParentScrollLock';
@@ -45,6 +46,8 @@ export const Popover = ({
tabIndex = 0,
children,
}: PropsWithChildren) => {
+ const { portalContainer } = useTheme();
+
const id = useId();
const ref = useRef(null);
const [isOpen, setIsOpen] = useState(false);
@@ -109,7 +112,7 @@ export const Popover = ({
{content}
,
- document.body,
+ portalContainer ?? document.body,
)}
);
diff --git a/src/renderer/shared/ui/Tabs/Tabs.tsx b/src/renderer/shared/ui/Tabs/Tabs.tsx
index f60b7d9e0b..35da4bea61 100644
--- a/src/renderer/shared/ui/Tabs/Tabs.tsx
+++ b/src/renderer/shared/ui/Tabs/Tabs.tsx
@@ -43,7 +43,7 @@ export const Tabs = ({
{items.map(({ id, panel }) => (
-
+
{panel}
))}
diff --git a/src/renderer/widgets/CreateWallet/ui/MultisigWallet/ConfirmationStep.tsx b/src/renderer/widgets/CreateWallet/ui/MultisigWallet/ConfirmationStep.tsx
index 849a467d78..4fa4104a0d 100644
--- a/src/renderer/widgets/CreateWallet/ui/MultisigWallet/ConfirmationStep.tsx
+++ b/src/renderer/widgets/CreateWallet/ui/MultisigWallet/ConfirmationStep.tsx
@@ -5,16 +5,17 @@ import { WalletType } from '@/shared/core';
import { useI18n } from '@/shared/i18n';
import { useToggle } from '@/shared/lib/hooks';
import { Step, nonNullable } from '@/shared/lib/utils';
-import { Alert, Button, Counter, DetailRow, Icon, IconButton, Separator } from '@/shared/ui';
+import { Alert, BodyText, Button, Counter, DetailRow, Icon, IconButton, Separator } from '@/shared/ui';
import { Box, Modal } from '@/shared/ui-kit';
import { SignButton } from '@/entities/operations';
import { FeeWithLabel, MultisigDepositWithLabel } from '@/entities/transaction';
+import { WalletIcon } from '@/entities/wallet';
import { confirmModel } from '../../model/confirm-model';
import { flowModel } from '../../model/flow-model';
import { formModel } from '../../model/form-model';
import { signatoryModel } from '../../model/signatory-model';
-import { SelectedSignatoriesModal, WalletItem } from './components';
+import { SelectedSignatoriesModal } from './components';
export const ConfirmationStep = () => {
const { t } = useI18n();
@@ -65,10 +66,15 @@ export const ConfirmationStep = () => {
-
+
+
+
+
+
+ {signer?.name || (signerWallet?.type === WalletType.POLKADOT_VAULT && signerWallet?.name) || ''}
+
+
+