diff --git a/packages/apps-routing/src/transfer.ts b/packages/apps-routing/src/transfer.ts index 8384a8b282..d3d37cd52b 100644 --- a/packages/apps-routing/src/transfer.ts +++ b/packages/apps-routing/src/transfer.ts @@ -4,7 +4,7 @@ import { Route } from './types'; -import Modal from '@polkadot/app-accounts/Accounts/modals/Transfer'; +import Modal from '@polkadot/app-accounts/modals/Transfer'; export default function create (t: (key: string, text: string, options: { ns: string }) => T): Route { return { diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx index 874631b1a4..2096cc2023 100644 --- a/packages/page-accounts/src/Accounts/Account.tsx +++ b/packages/page-accounts/src/Accounts/Account.tsx @@ -22,18 +22,18 @@ import { BN_ZERO, formatBalance, formatNumber } from '@polkadot/util'; import { useTranslation } from '../translate'; import { createMenuGroup } from '../util'; -import Backup from './modals/Backup'; -import ChangePass from './modals/ChangePass'; -import DelegateModal from './modals/Delegate'; -import Derive from './modals/Derive'; -import IdentityMain from './modals/IdentityMain'; -import IdentitySub from './modals/IdentitySub'; -import ProxyOverview from './modals/ProxyOverview'; -import MultisigApprove from './modals/MultisigApprove'; -import RecoverAccount from './modals/RecoverAccount'; -import RecoverSetup from './modals/RecoverSetup'; -import Transfer from './modals/Transfer'; -import UndelegateModal from './modals/Undelegate'; +import Backup from '../modals/Backup'; +import ChangePass from '../modals/ChangePass'; +import DelegateModal from '../modals/Delegate'; +import Derive from '../modals/Derive'; +import IdentityMain from '../modals/IdentityMain'; +import IdentitySub from '../modals/IdentitySub'; +import ProxyOverview from '../modals/ProxyOverview'; +import MultisigApprove from '../modals/MultisigApprove'; +import RecoverAccount from '../modals/RecoverAccount'; +import RecoverSetup from '../modals/RecoverSetup'; +import Transfer from '../modals/Transfer'; +import UndelegateModal from '../modals/Undelegate'; import useMultisigApprovals from './useMultisigApprovals'; import useProxies from './useProxies'; diff --git a/packages/page-accounts/src/Accounts/index.tsx b/packages/page-accounts/src/Accounts/index.tsx index e17ac3bc1d..7166fb503f 100644 --- a/packages/page-accounts/src/Accounts/index.tsx +++ b/packages/page-accounts/src/Accounts/index.tsx @@ -17,11 +17,11 @@ import { Button, Input, Table } from '@polkadot/react-components'; import { BN_ZERO } from '@polkadot/util'; import { useTranslation } from '../translate'; -import CreateModal from './modals/Create'; -import ImportModal from './modals/Import'; -import Multisig from './modals/MultisigCreate'; -import Proxy from './modals/ProxiedAdd'; -import Qr from './modals/Qr'; +import CreateModal from '../modals/Create'; +import ImportModal from '../modals/Import'; +import Multisig from '../modals/MultisigCreate'; +import Proxy from '../modals/ProxiedAdd'; +import Qr from '../modals/Qr'; import Account from './Account'; import BannerClaims from './BannerClaims'; import BannerDOT from './BannerDOT'; diff --git a/packages/page-accounts/src/Sidebar/Sidebar.tsx b/packages/page-accounts/src/Sidebar/Sidebar.tsx index afe6415230..835c336b8a 100644 --- a/packages/page-accounts/src/Sidebar/Sidebar.tsx +++ b/packages/page-accounts/src/Sidebar/Sidebar.tsx @@ -8,7 +8,7 @@ import { useAccountInfo, useToggle } from '@polkadot/react-hooks'; import { colorLink } from '@polkadot/react-components/styles/theme'; import { AccountName, Button, Icon, IdentityIcon, Input, LinkExternal, Sidebar, Tags } from '@polkadot/react-components'; -import Transfer from '../Accounts/modals/Transfer'; +import Transfer from '../modals/Transfer'; import { useTranslation } from '../translate'; import Balances from './Balances'; import Flags from './Flags'; diff --git a/packages/page-accounts/src/Vanity/index.tsx b/packages/page-accounts/src/Vanity/index.tsx index a17e307665..46abba0e22 100644 --- a/packages/page-accounts/src/Vanity/index.tsx +++ b/packages/page-accounts/src/Vanity/index.tsx @@ -15,7 +15,7 @@ import generator from '@polkadot/vanitygen/generator'; import matchRegex from '@polkadot/vanitygen/regex'; import generatorSort from '@polkadot/vanitygen/sort'; -import CreateModal from '../Accounts/modals/Create'; +import CreateModal from '../modals/Create'; import { useTranslation } from '../translate'; import Match from './Match'; diff --git a/packages/page-accounts/src/Accounts/modals/Backup.tsx b/packages/page-accounts/src/modals/Backup.tsx similarity index 98% rename from packages/page-accounts/src/Accounts/modals/Backup.tsx rename to packages/page-accounts/src/modals/Backup.tsx index 5027a56604..d9b1bc05dc 100644 --- a/packages/page-accounts/src/Accounts/modals/Backup.tsx +++ b/packages/page-accounts/src/modals/Backup.tsx @@ -7,7 +7,7 @@ import React, { useCallback, useState } from 'react'; import { AddressRow, Button, Modal, Password } from '@polkadot/react-components'; import keyring from '@polkadot/ui-keyring'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { onClose: () => void; diff --git a/packages/page-accounts/src/Accounts/modals/ChangePass.tsx b/packages/page-accounts/src/modals/ChangePass.tsx similarity index 98% rename from packages/page-accounts/src/Accounts/modals/ChangePass.tsx rename to packages/page-accounts/src/modals/ChangePass.tsx index 79ba547b38..24631fde1a 100644 --- a/packages/page-accounts/src/Accounts/modals/ChangePass.tsx +++ b/packages/page-accounts/src/modals/ChangePass.tsx @@ -6,7 +6,7 @@ import React, { useCallback, useState } from 'react'; import { AddressRow, Button, Modal, Password, PasswordStrength } from '@polkadot/react-components'; import keyring from '@polkadot/ui-keyring'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { className?: string; diff --git a/packages/page-accounts/src/Accounts/modals/Create.tsx b/packages/page-accounts/src/modals/Create.tsx similarity index 98% rename from packages/page-accounts/src/Accounts/modals/Create.tsx rename to packages/page-accounts/src/modals/Create.tsx index 8de2ccdc85..629b0d97db 100644 --- a/packages/page-accounts/src/Accounts/modals/Create.tsx +++ b/packages/page-accounts/src/modals/Create.tsx @@ -5,7 +5,7 @@ import { ActionStatus } from '@polkadot/react-components/Status/types'; import { CreateResult } from '@polkadot/ui-keyring/types'; import { KeypairType } from '@polkadot/util-crypto/types'; -import { ModalProps } from '../../types'; +import { ModalProps } from '../types'; import FileSaver from 'file-saver'; import React, { useCallback, useMemo, useState } from 'react'; @@ -19,8 +19,8 @@ import { isHex, u8aToHex } from '@polkadot/util'; import { keyExtractSuri, mnemonicGenerate, mnemonicValidate, randomAsU8a } from '@polkadot/util-crypto'; import { getEnvironment } from '@polkadot/react-api/util'; -import { useTranslation } from '../../translate'; -import PasswordInput from '../PasswordInput'; +import { useTranslation } from '../translate'; +import PasswordInput from '../Accounts/PasswordInput'; import CreateConfirmation from './CreateConfirmation'; interface Props extends ModalProps { diff --git a/packages/page-accounts/src/Accounts/modals/CreateConfirmation.tsx b/packages/page-accounts/src/modals/CreateConfirmation.tsx similarity index 96% rename from packages/page-accounts/src/Accounts/modals/CreateConfirmation.tsx rename to packages/page-accounts/src/modals/CreateConfirmation.tsx index 107142d768..91df2e83ee 100644 --- a/packages/page-accounts/src/Accounts/modals/CreateConfirmation.tsx +++ b/packages/page-accounts/src/modals/CreateConfirmation.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { AddressRow, Button, Modal } from '@polkadot/react-components'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { address: string; diff --git a/packages/page-accounts/src/Accounts/modals/Delegate.tsx b/packages/page-accounts/src/modals/Delegate.tsx similarity index 98% rename from packages/page-accounts/src/Accounts/modals/Delegate.tsx rename to packages/page-accounts/src/modals/Delegate.tsx index 1ff1f3716d..7ca1208d15 100644 --- a/packages/page-accounts/src/Accounts/modals/Delegate.tsx +++ b/packages/page-accounts/src/modals/Delegate.tsx @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AmountValidateState } from '../types'; +import { AmountValidateState } from '../Accounts/types'; import BN from 'bn.js'; import React, { useState } from 'react'; @@ -11,7 +11,7 @@ import { BalanceFree } from '@polkadot/react-query'; import { Conviction } from '@polkadot/types/interfaces'; import { BN_ZERO } from '@polkadot/util'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; import ValidateAmount from './InputValidateAmount'; interface Props { diff --git a/packages/page-accounts/src/Accounts/modals/Derive.tsx b/packages/page-accounts/src/modals/Derive.tsx similarity index 99% rename from packages/page-accounts/src/Accounts/modals/Derive.tsx rename to packages/page-accounts/src/modals/Derive.tsx index bedc101cf5..140cc17f9d 100644 --- a/packages/page-accounts/src/Accounts/modals/Derive.tsx +++ b/packages/page-accounts/src/modals/Derive.tsx @@ -12,7 +12,7 @@ import { useApi, useDebounce, useToggle } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; import { keyExtractPath } from '@polkadot/util-crypto'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; import { downloadAccount } from './Create'; import CreateConfirmation from './CreateConfirmation'; diff --git a/packages/page-accounts/src/Accounts/modals/IdentityMain.tsx b/packages/page-accounts/src/modals/IdentityMain.tsx similarity index 99% rename from packages/page-accounts/src/Accounts/modals/IdentityMain.tsx rename to packages/page-accounts/src/modals/IdentityMain.tsx index 90de65adc9..1d8294acbd 100644 --- a/packages/page-accounts/src/Accounts/modals/IdentityMain.tsx +++ b/packages/page-accounts/src/modals/IdentityMain.tsx @@ -12,7 +12,7 @@ import { useApi, useCall } from '@polkadot/react-hooks'; import { Data, Option } from '@polkadot/types'; import { u8aToString } from '@polkadot/util'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { address: string; diff --git a/packages/page-accounts/src/Accounts/modals/IdentitySub.tsx b/packages/page-accounts/src/modals/IdentitySub.tsx similarity index 99% rename from packages/page-accounts/src/Accounts/modals/IdentitySub.tsx rename to packages/page-accounts/src/modals/IdentitySub.tsx index 65507b50bb..1258f49c78 100644 --- a/packages/page-accounts/src/Accounts/modals/IdentitySub.tsx +++ b/packages/page-accounts/src/modals/IdentitySub.tsx @@ -11,7 +11,7 @@ import { useAccounts, useApi, useCall } from '@polkadot/react-hooks'; import { Data, Option, Vec } from '@polkadot/types'; import { u8aToString } from '@polkadot/util'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { address: string; diff --git a/packages/page-accounts/src/Accounts/modals/Import.tsx b/packages/page-accounts/src/modals/Import.tsx similarity index 98% rename from packages/page-accounts/src/Accounts/modals/Import.tsx rename to packages/page-accounts/src/modals/Import.tsx index 524cd7222b..d0396a9c0f 100644 --- a/packages/page-accounts/src/Accounts/modals/Import.tsx +++ b/packages/page-accounts/src/modals/Import.tsx @@ -4,14 +4,14 @@ import { KeyringPair$Json } from '@polkadot/keyring/types'; import { ActionStatus } from '@polkadot/react-components/Status/types'; -import { ModalProps } from '../../types'; +import { ModalProps } from '../types'; import React, { useCallback, useState } from 'react'; import { AddressRow, Button, InputAddress, InputFile, Modal, Password } from '@polkadot/react-components'; import { isObject, u8aToString } from '@polkadot/util'; import keyring from '@polkadot/ui-keyring'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props extends ModalProps { className?: string; diff --git a/packages/page-accounts/src/Accounts/modals/InputValidateAmount.tsx b/packages/page-accounts/src/modals/InputValidateAmount.tsx similarity index 94% rename from packages/page-accounts/src/Accounts/modals/InputValidateAmount.tsx rename to packages/page-accounts/src/modals/InputValidateAmount.tsx index 15337ce05f..9978190057 100644 --- a/packages/page-accounts/src/Accounts/modals/InputValidateAmount.tsx +++ b/packages/page-accounts/src/modals/InputValidateAmount.tsx @@ -3,14 +3,14 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { DeriveBalancesAll } from '@polkadot/api-derive/types'; -import { AmountValidateState } from '../types'; +import { AmountValidateState } from '../Accounts/types'; import BN from 'bn.js'; import React, { useEffect, useState } from 'react'; import { useApi, useCall } from '@polkadot/react-hooks'; import { BN_ZERO } from '@polkadot/util'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { amount?: BN | null; diff --git a/packages/page-accounts/src/Accounts/modals/MultisigApprove.tsx b/packages/page-accounts/src/modals/MultisigApprove.tsx similarity index 99% rename from packages/page-accounts/src/Accounts/modals/MultisigApprove.tsx rename to packages/page-accounts/src/modals/MultisigApprove.tsx index 1b21d9caf2..b2bb628d7a 100644 --- a/packages/page-accounts/src/Accounts/modals/MultisigApprove.tsx +++ b/packages/page-accounts/src/modals/MultisigApprove.tsx @@ -12,7 +12,7 @@ import { Dropdown, InputAddress, Modal, Toggle, TxButton, Input } from '@polkado import { useAccounts, useApi, useWeight } from '@polkadot/react-hooks'; import { assert, isHex } from '@polkadot/util'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { address: string; diff --git a/packages/page-accounts/src/Accounts/modals/MultisigCreate.tsx b/packages/page-accounts/src/modals/MultisigCreate.tsx similarity index 97% rename from packages/page-accounts/src/Accounts/modals/MultisigCreate.tsx rename to packages/page-accounts/src/modals/MultisigCreate.tsx index b808ddeafd..aa67020be1 100644 --- a/packages/page-accounts/src/Accounts/modals/MultisigCreate.tsx +++ b/packages/page-accounts/src/modals/MultisigCreate.tsx @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { ActionStatus } from '@polkadot/react-components/Status/types'; -import { ModalProps } from '../../types'; +import { ModalProps } from '../types'; import BN from 'bn.js'; import React, { useCallback, useState } from 'react'; @@ -12,8 +12,8 @@ import { useApi } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; import { BN_ONE } from '@polkadot/util'; -import { useTranslation } from '../../translate'; -import useKnownAddresses from '../useKnownAddresses'; +import { useTranslation } from '../translate'; +import useKnownAddresses from '../Accounts/useKnownAddresses'; interface Props extends ModalProps { className?: string; diff --git a/packages/page-accounts/src/Accounts/modals/ProxiedAdd.tsx b/packages/page-accounts/src/modals/ProxiedAdd.tsx similarity index 96% rename from packages/page-accounts/src/Accounts/modals/ProxiedAdd.tsx rename to packages/page-accounts/src/modals/ProxiedAdd.tsx index b96a3d3f0b..3a9de479f3 100644 --- a/packages/page-accounts/src/Accounts/modals/ProxiedAdd.tsx +++ b/packages/page-accounts/src/modals/ProxiedAdd.tsx @@ -3,15 +3,15 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { ActionStatus } from '@polkadot/react-components/Status/types'; -import { ModalProps } from '../../types'; +import { ModalProps } from '../types'; import React, { useCallback, useState } from 'react'; import { Button, Input, InputAddressSimple, Modal } from '@polkadot/react-components'; import { useApi } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; -import { useTranslation } from '../../translate'; -import useProxies from '../useProxies'; +import { useTranslation } from '../translate'; +import useProxies from '../Accounts/useProxies'; interface Props extends ModalProps { className?: string; diff --git a/packages/page-accounts/src/Accounts/modals/ProxyOverview.tsx b/packages/page-accounts/src/modals/ProxyOverview.tsx similarity index 99% rename from packages/page-accounts/src/Accounts/modals/ProxyOverview.tsx rename to packages/page-accounts/src/modals/ProxyOverview.tsx index c0311e2088..d8372f9304 100644 --- a/packages/page-accounts/src/Accounts/modals/ProxyOverview.tsx +++ b/packages/page-accounts/src/modals/ProxyOverview.tsx @@ -12,7 +12,7 @@ import { registry } from '@polkadot/react-api'; import { Button, InputAddress, Modal, TxButton, Dropdown } from '@polkadot/react-components'; import { useApi } from '@polkadot/react-hooks'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; import styled from 'styled-components'; type PrevProxy = [AccountId, ProxyType]; diff --git a/packages/page-accounts/src/Accounts/modals/Qr.tsx b/packages/page-accounts/src/modals/Qr.tsx similarity index 97% rename from packages/page-accounts/src/Accounts/modals/Qr.tsx rename to packages/page-accounts/src/modals/Qr.tsx index 7242ad0fc3..99daf4f547 100644 --- a/packages/page-accounts/src/Accounts/modals/Qr.tsx +++ b/packages/page-accounts/src/modals/Qr.tsx @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { ActionStatus } from '@polkadot/react-components/Status/types'; -import { ModalProps } from '../../types'; +import { ModalProps } from '../types'; import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; @@ -11,8 +11,8 @@ import { AddressRow, Button, Input, InputAddress, Modal, QrScanAddress } from '@ import { useApi, useIpfs } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; -import PasswordInput from '../PasswordInput'; -import { useTranslation } from '../../translate'; +import PasswordInput from '../Accounts/PasswordInput'; +import { useTranslation } from '../translate'; interface Scanned { content: string; diff --git a/packages/page-accounts/src/Accounts/modals/RecoverAccount.tsx b/packages/page-accounts/src/modals/RecoverAccount.tsx similarity index 96% rename from packages/page-accounts/src/Accounts/modals/RecoverAccount.tsx rename to packages/page-accounts/src/modals/RecoverAccount.tsx index f3b0027c8f..bbc3314c12 100644 --- a/packages/page-accounts/src/Accounts/modals/RecoverAccount.tsx +++ b/packages/page-accounts/src/modals/RecoverAccount.tsx @@ -5,7 +5,7 @@ import React, { useState } from 'react'; import { InputAddress, Modal, TxButton } from '@polkadot/react-components'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { address: string; diff --git a/packages/page-accounts/src/Accounts/modals/RecoverSetup.tsx b/packages/page-accounts/src/modals/RecoverSetup.tsx similarity index 97% rename from packages/page-accounts/src/Accounts/modals/RecoverSetup.tsx rename to packages/page-accounts/src/modals/RecoverSetup.tsx index 8f9c54715a..455a6dd072 100644 --- a/packages/page-accounts/src/Accounts/modals/RecoverSetup.tsx +++ b/packages/page-accounts/src/modals/RecoverSetup.tsx @@ -7,8 +7,8 @@ import React, { useState } from 'react'; import { InputAddressMulti, InputAddress, InputNumber, Modal, TxButton } from '@polkadot/react-components'; import { sortAddresses } from '@polkadot/util-crypto'; -import { useTranslation } from '../../translate'; -import useKnownAddresses from '../useKnownAddresses'; +import { useTranslation } from '../translate'; +import useKnownAddresses from '../Accounts/useKnownAddresses'; interface Props { address: string; diff --git a/packages/page-accounts/src/Accounts/modals/Transfer.tsx b/packages/page-accounts/src/modals/Transfer.tsx similarity index 82% rename from packages/page-accounts/src/Accounts/modals/Transfer.tsx rename to packages/page-accounts/src/modals/Transfer.tsx index 6eccb35b32..4ba2152ac7 100644 --- a/packages/page-accounts/src/Accounts/modals/Transfer.tsx +++ b/packages/page-accounts/src/modals/Transfer.tsx @@ -5,12 +5,12 @@ import BN from 'bn.js'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components'; +import { InputAddress, InputBalance, Modal, Toggle, TxButton } from '@polkadot/react-components'; import { useApi } from '@polkadot/react-hooks'; import { Available } from '@polkadot/react-query'; import { BN_ZERO } from '@polkadot/util'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { className?: string; @@ -24,6 +24,7 @@ function Transfer ({ className = '', onClose, recipientId: propRecipientId, send const { api } = useApi(); const [amount, setAmount] = useState(BN_ZERO); const [hasAvailable] = useState(true); + const [isProtected, setIsProtected] = useState(true); const [maxBalance] = useState(BN_ZERO); const [recipientId, setRecipientId] = useState(propRecipientId || null); const [senderId, setSenderId] = useState(propSenderId || null); @@ -98,9 +99,22 @@ function Transfer ({ className = '', onClose, recipientId: propRecipientId, send isDisabled label={t('existential deposit')} /> + {api.tx.balances.transferKeepAlive && ( + ('Transfer with account keep-alive checks') + : t('Normal transfer without keep-alive checks') + } + onChange={setIsProtected} + value={isProtected} + /> + )}

{t('If the recipient account is new, the balance needs to be more than the existential deposit. Likewise if the sending account balance drops below the same value, the account will be removed from the state.')}

+

{t('With the keep-alive option set, the account is protected against removal due to low balances.')}

@@ -113,7 +127,11 @@ function Transfer ({ className = '', onClose, recipientId: propRecipientId, send label={t('Make Transfer')} onStart={onClose} params={[recipientId, amount]} - tx='balances.transfer' + tx={ + isProtected && api.tx.balances.transferKeepAlive + ? 'balances.transferKeepAlive' + : 'balances.transfer' + } /> @@ -134,4 +152,8 @@ export default React.memo(styled(Transfer)` label.with-help { flex-basis: 10rem; } + + .aliveToggle { + text-align: right; + } `); diff --git a/packages/page-accounts/src/Accounts/modals/Undelegate.tsx b/packages/page-accounts/src/modals/Undelegate.tsx similarity index 96% rename from packages/page-accounts/src/Accounts/modals/Undelegate.tsx rename to packages/page-accounts/src/modals/Undelegate.tsx index c2c5dbf074..4195eea738 100644 --- a/packages/page-accounts/src/Accounts/modals/Undelegate.tsx +++ b/packages/page-accounts/src/modals/Undelegate.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { InputAddress, Modal, TxButton } from '@polkadot/react-components'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface Props { accountDelegating: string | null; diff --git a/packages/page-addresses/src/Contacts/Address.tsx b/packages/page-addresses/src/Contacts/Address.tsx index 802e5d9a97..b9e2b8d74a 100644 --- a/packages/page-addresses/src/Contacts/Address.tsx +++ b/packages/page-addresses/src/Contacts/Address.tsx @@ -8,7 +8,7 @@ import { ActionStatus } from '@polkadot/react-components/Status/types'; import React, { useCallback, useEffect, useState } from 'react'; import styled from 'styled-components'; -import Transfer from '@polkadot/app-accounts/Accounts/modals/Transfer'; +import Transfer from '@polkadot/app-accounts/modals/Transfer'; import { AddressSmall, AddressInfo, Button, ChainLock, Icon, LinkExternal, Forget, Menu, Popup, Tags } from '@polkadot/react-components'; import { useApi, useCall } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; diff --git a/packages/page-addresses/src/Contacts/index.tsx b/packages/page-addresses/src/Contacts/index.tsx index 7b95186afb..57a68e4d0a 100644 --- a/packages/page-addresses/src/Contacts/index.tsx +++ b/packages/page-addresses/src/Contacts/index.tsx @@ -10,7 +10,7 @@ import { Button, Input, Table } from '@polkadot/react-components'; import { useAddresses, useFavorites, useLoadingDelay, useToggle } from '@polkadot/react-hooks'; import { useTranslation } from '../translate'; -import CreateModal from './modals/Create'; +import CreateModal from '../modals/Create'; import Address from './Address'; type SortedAddress = { address: string; isFavorite: boolean }; diff --git a/packages/page-addresses/src/Contacts/modals/Create.tsx b/packages/page-addresses/src/modals/Create.tsx similarity index 97% rename from packages/page-addresses/src/Contacts/modals/Create.tsx rename to packages/page-addresses/src/modals/Create.tsx index b80c7567ff..914ff56af6 100644 --- a/packages/page-addresses/src/Contacts/modals/Create.tsx +++ b/packages/page-addresses/src/modals/Create.tsx @@ -4,14 +4,14 @@ import { DeriveAccountInfo } from '@polkadot/api-derive/types'; import { ActionStatus } from '@polkadot/react-components/Status/types'; -import { ModalProps as Props } from '../../types'; +import { ModalProps as Props } from '../types'; import React, { useCallback, useState } from 'react'; import { AddressRow, Button, Input, InputAddress, Modal } from '@polkadot/react-components'; import { useApi, useCall } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; -import { useTranslation } from '../../translate'; +import { useTranslation } from '../translate'; interface AddrState { address: string; diff --git a/packages/react-components/src/Status/index.tsx b/packages/react-components/src/Status/index.tsx index 0cbed7c424..5c9efee059 100644 --- a/packages/react-components/src/Status/index.tsx +++ b/packages/react-components/src/Status/index.tsx @@ -206,7 +206,7 @@ function Status ({ className = '' }: Props): React.ReactElement | null { export default React.memo(styled(Status)` display: inline-block; position: fixed; - right: 0.375rem; + right: 0.75rem; top: 0.75rem; width: 23rem; z-index: 1001;