Merge branch 'main' into useFormatPrice

Author: Nick-1979

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+# [0.14.0](https://github.com/polkagate/extension/compare/v0.13.1...v0.14.0) (2024-09-29)
+
+
+### Features
+
+* add BTC and ETH as currency ([#1563](https://github.com/polkagate/extension/issues/1563)) ([8b57127](https://github.com/polkagate/extension/commit/8b5712749f39ca3c1bee426bcc23b3e6ffbd368e)), closes [#1552](https://github.com/polkagate/extension/issues/1552)
+
 ## [0.13.1](https://github.com/polkagate/extension/compare/v0.13.0...v0.13.1) (2024-09-28)
 
 

packages/extension-polkagate/src/fullscreen/accountDetails/index.tsx

@@ -23,7 +23,7 @@ import ReceiveModal from '../../popup/receive/ReceiveModal';
 import { ASSET_HUBS, GOVERNANCE_CHAINS, STAKING_CHAINS } from '../../util/constants';
 import getParentNameSuri from '../../util/getParentNameSuri';
 import { getPriceIdByChainName } from '../../util/utils';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import Bread from '../partials/Bread';
 import DeriveAccountModal from '../partials/DeriveAccountModal';
 import ExportAccountModal from '../partials/ExportAccountModal';

packages/extension-polkagate/src/fullscreen/addNewChain/index.tsx

@@ -24,7 +24,7 @@ import allChains from '../../util/chains';
 import { FULLSCREEN_WIDTH } from '../../util/constants';
 import { isWss } from '../../util/utils';
 import { metadataFromApi } from '../../util/workers/utils';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import { convertToHyphenated } from '../governance/utils/util';
 import Bread from '../partials/Bread';
 import { Title } from '../sendFund/InputPage';

packages/extension-polkagate/src/fullscreen/governance/FullScreenHeader.tsx

@@ -9,7 +9,7 @@ import { useParams } from 'react-router';
 
 import { logoBlack } from '../../assets/logos';
 import { ActionContext, GenesisHashOptionsContext } from '../../components';
-import { useApi, useChain } from '../../hooks';
+import { useInfo } from '../../hooks';
 import { FullScreenChainSwitch, RemoteNodeSelectorWithSignals } from '../../partials';
 import { EXTENSION_NAME, GOVERNANCE_CHAINS, IDENTITY_CHAINS, SOCIAL_RECOVERY_CHAINS, STAKING_CHAINS } from '../../util/constants';
 import { openOrFocusTab } from '../accountDetails/components/CommonTasks';
@@ -25,13 +25,12 @@ interface Props {
   unableToChangeAccount?: boolean;
 }
 
-export function FullScreenHeader ({ _otherComponents, noAccountDropDown = false, noChainSwitch = false, page, unableToChangeAccount }: Props): React.ReactElement {
+function FullScreenHeader ({ _otherComponents, noAccountDropDown = false, noChainSwitch = false, page, unableToChangeAccount }: Props): React.ReactElement {
   const { address, postId, topMenu } = useParams<{ address: string, topMenu?: 'referenda' | 'fellowship', postId?: string }>();
   const allChains = useContext(GenesisHashOptionsContext);
-
-  const api = useApi(address);
-  const chain = useChain(address);
   const onAction = useContext(ActionContext);
+
+  const { api, chain } = useInfo(address);
   const isThisHome = window.location.hash === '#/';
 
   const filteredChains = useMemo(() => {
@@ -85,7 +84,7 @@ export function FullScreenHeader ({ _otherComponents, noAccountDropDown = false,
                 src={logoBlack as string}
                 sx={{ height: 50, mr: '2%', width: 50 }}
               />
-              <Typography color='white' fontFamily='Eras' fontSize='40px'>
+              <Typography color='white' fontFamily='Eras' fontSize='40px' sx={{ userSelect: 'none' }}>
                 {EXTENSION_NAME}
               </Typography>
             </Grid>
@@ -130,3 +129,5 @@ export function FullScreenHeader ({ _otherComponents, noAccountDropDown = false,
     </Grid>
   );
 }
+
+export default React.memo(FullScreenHeader);

packages/extension-polkagate/src/fullscreen/governance/index.tsx

@@ -23,7 +23,7 @@ import { getLatestReferendums, getReferendumsListSb, getTrackOrFellowshipReferen
 import { AllReferendaStats } from './AllReferendaStats';
 import Bread from './Bread';
 import FellowshipsList from './FellowshipsList';
-import { FullScreenHeader } from './FullScreenHeader';
+import FullScreenHeader from './FullScreenHeader';
 import ReferendumSummary from './ReferendumSummary';
 import SearchBox from './SearchBox';
 import Toolbar from './Toolbar';

packages/extension-polkagate/src/fullscreen/governance/post/index.tsx

@@ -14,7 +14,7 @@ import { useHistory, useLocation } from 'react-router-dom';
 import { PButton } from '../../../components';
 import { useApi, useChainName, useDecidingCount, useFullscreen, useMyVote, useReferendum, useTrack, useTranslation } from '../../../hooks';
 import Bread from '../Bread';
-import { FullScreenHeader } from '../FullScreenHeader';
+import FullScreenHeader from '../FullScreenHeader';
 import Toolbar from '../Toolbar';
 import { ENDED_STATUSES } from '../utils/consts';
 import { isFinished } from '../utils/helpers';

packages/extension-polkagate/src/fullscreen/homeFullScreen/components/HeaderComponents.tsx

@@ -1,6 +1,5 @@
 // Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-// @ts-nocheck
 
 /* eslint-disable react/jsx-max-props-per-line */
 
@@ -17,9 +16,23 @@ interface Props {
   setHideNumbers: React.Dispatch<React.SetStateAction<boolean | undefined>>;
 }
 
-export default function HeaderComponents({ hideNumbers, setHideNumbers }: Props): React.ReactElement {
+const HideNumbers = ({ hideNumbers, onHideClick }: { hideNumbers: boolean | undefined, onHideClick: () => void}) => {
   const { t } = useTranslation();
 
+  return (
+    <Grid alignItems='center' container direction='column' item onClick={onHideClick} sx={{ border: '1px solid', borderColor: 'secondary.light', borderRadius: '5px', cursor: 'pointer', minWidth: '92px', p: '2px 6px', width: 'fit-content' }}>
+      {hideNumbers
+        ? <ShowIcon color='#fff' height={18} scale={1.2} width={40} />
+        : <HideIcon color='#fff' height={18} scale={1.2} width={40} />
+      }
+      <Typography sx={{ color: '#fff', fontSize: '12px', fontWeight: 500, textWrap: 'nowrap', userSelect: 'none' }}>
+        {hideNumbers ? t('Show numbers') : t('Hide numbers')}
+      </Typography>
+    </Grid>
+  );
+};
+
+function HeaderComponents ({ hideNumbers, setHideNumbers }: Props): React.ReactElement {
   const onHideClick = useCallback(() => {
     setHideNumbers(!hideNumbers);
     window.localStorage.setItem('hide_numbers', hideNumbers ? 'false' : 'true');
@@ -31,23 +44,16 @@ export default function HeaderComponents({ hideNumbers, setHideNumbers }: Props)
     isHide === 'false' || isHide === null ? setHideNumbers(false) : setHideNumbers(true);
   }, [setHideNumbers]);
 
-  const HideNumbers = () => (
-    <Grid alignItems='center' container direction='column' item onClick={onHideClick} sx={{ border: '1px solid', borderColor: 'secondary.light', borderRadius: '5px', cursor: 'pointer', minWidth: '92px', p: '2px 6px', width: 'fit-content' }}>
-      {hideNumbers
-        ? <ShowIcon color='#fff' height={18} scale={1.2} width={40} />
-        : <HideIcon color='#fff' height={18} scale={1.2} width={40} />
-      }
-      <Typography sx={{ color: '#fff', fontSize: '12px', fontWeight: 500, textWrap: 'nowrap' }}>
-        {hideNumbers ? t('Show numbers') : t('Hide numbers')}
-      </Typography>
-    </Grid>
-  );
-
   return (
     <Grid columnGap='18px' container item pl='18px' width='fit-content'>
       <Currency />
       <FavoriteChains />
-      <HideNumbers />
+      <HideNumbers
+        hideNumbers={hideNumbers}
+        onHideClick={onHideClick}
+      />
     </Grid>
   );
 }
+
+export default React.memo(HeaderComponents);

packages/extension-polkagate/src/fullscreen/homeFullScreen/index.tsx

@@ -9,7 +9,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import { AccountContext, ActionContext } from '../../components';
 import { useAccountsOrder, useAlerts, useFullscreen, useProfileAccounts, useTranslation } from '../../hooks';
 import { AddNewAccountButton } from '../../partials';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import HeaderComponents from './components/HeaderComponents';
 import DraggableAccountsList from './partials/DraggableAccountList';
 import HomeMenu from './partials/HomeMenu';

packages/extension-polkagate/src/fullscreen/manageIdentity/index.tsx

@@ -22,7 +22,7 @@ import { cryptoWaitReady } from '@polkadot/util-crypto';
 import { Progress, Warning } from '../../components';
 import { useApiWithChain2, useFormatted, useFullscreen, usePeopleChain, useTranslation } from '../../hooks';
 import { FULLSCREEN_WIDTH } from '../../util/constants';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import Bread from '../partials/Bread';
 import PreviewIdentity from './Preview';
 import RequestJudgement from './RequestJudgement';

packages/extension-polkagate/src/fullscreen/manageProxies/index.tsx

@@ -16,7 +16,7 @@ import { BN, BN_ZERO } from '@polkadot/util';
 import { Warning } from '../../components';
 import { useFullscreen, useInfo, useTranslation } from '../../hooks';
 import { FULLSCREEN_WIDTH, PROXY_CHAINS } from '../../util/constants';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import AddProxy from './AddProxy';
 import Manage from './Manage';
 import Review from './Review';

packages/extension-polkagate/src/fullscreen/onboarding/index.tsx

@@ -17,7 +17,7 @@ import { createAccountExternal, windowOpen } from '../../messaging';
 import FollowUs from '../../popup/welcome/FollowUs';
 import NeedHelp from '../../popup/welcome/NeedHelp';
 import Privacy from '../../popup/welcome/Privacy';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import IconBox from './IconBox';
 
 const demoAccount = '1ChFWeNRLarAPRCTM3bfJmncJbSAbSS9yqjueWz7jX7iTVZ';

packages/extension-polkagate/src/fullscreen/sendFund/index.tsx

@@ -21,7 +21,7 @@ import { cryptoWaitReady } from '@polkadot/util-crypto';
 
 import { useBalances, useChain, useFullscreen, useTranslation } from '../../hooks';
 import { openOrFocusTab } from '../accountDetails/components/CommonTasks';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import WaitScreen from '../governance/partials/WaitScreen';
 import Bread from '../partials/Bread';
 import { STEPS } from '../stake/pool/stake';

packages/extension-polkagate/src/fullscreen/socialRecovery/index.tsx

@@ -20,7 +20,7 @@ import { cryptoWaitReady } from '@polkadot/util-crypto';
 import { Warning } from '../../components';
 import { useAccountsInfo, useActiveRecoveries, useFullscreen, useInfo, useLostAccountInformation, useTranslation } from '../../hooks';
 import { FULLSCREEN_WIDTH, SOCIAL_RECOVERY_CHAINS } from '../../util/constants';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import Bread from '../partials/Bread';
 import { AddressWithIdentity } from './components/SelectTrustedFriend';
 import RecoveryCheckProgress from './partial/RecoveryCheckProgress';

packages/extension-polkagate/src/fullscreen/stake/index.tsx

@@ -18,7 +18,7 @@ import { PButton, PoolStakingIcon } from '../../components';
 import { useTranslation } from '../../components/translate';
 import { useFullscreen, useInfo, usePoolConsts } from '../../hooks';
 import { openOrFocusTab } from '../accountDetails/components/CommonTasks';
-import { FullScreenHeader } from '../governance/FullScreenHeader';
+import FullScreenHeader from '../governance/FullScreenHeader';
 import Bread from '../partials/Bread';
 import { Title } from '../sendFund/InputPage';
 import AdvancedOptions from './partials/AdvancedOptions';

packages/extension-polkagate/src/fullscreen/stake/pool/commonTasks/manageValidators/index.tsx

@@ -13,7 +13,7 @@ import React, { useCallback, useMemo, useState } from 'react';
 import { useParams } from 'react-router';
 
 import { openOrFocusTab } from '@polkadot/extension-polkagate/src/fullscreen/accountDetails/components/CommonTasks';
-import { FullScreenHeader } from '@polkadot/extension-polkagate/src/fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '@polkadot/extension-polkagate/src/fullscreen/governance/FullScreenHeader';
 import Bread from '@polkadot/extension-polkagate/src/fullscreen/partials/Bread';
 import { Title } from '@polkadot/extension-polkagate/src/fullscreen/sendFund/InputPage';
 import { FULLSCREEN_WIDTH } from '@polkadot/extension-polkagate/src/util/constants';

packages/extension-polkagate/src/fullscreen/stake/pool/index.tsx

@@ -15,7 +15,7 @@ import { PoolStakingIcon } from '../../../components';
 import { useBalances, useFullscreen, useInfo, usePool, useTranslation, useUnSupportedNetwork } from '../../../hooks';
 import { FULLSCREEN_WIDTH, STAKING_CHAINS } from '../../../util/constants';
 import { openOrFocusTab } from '../../accountDetails/components/CommonTasks';
-import { FullScreenHeader } from '../../governance/FullScreenHeader';
+import FullScreenHeader from '../../governance/FullScreenHeader';
 import Bread from '../../partials/Bread';
 import { Title } from '../../sendFund/InputPage';
 import Entry from '../Entry';

packages/extension-polkagate/src/fullscreen/stake/solo/commonTasks/manageValidators/index.tsx

@@ -12,7 +12,7 @@ import React, { useCallback, useState } from 'react';
 import { useParams } from 'react-router';
 
 import { openOrFocusTab } from '@polkadot/extension-polkagate/src/fullscreen/accountDetails/components/CommonTasks';
-import { FullScreenHeader } from '@polkadot/extension-polkagate/src/fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '@polkadot/extension-polkagate/src/fullscreen/governance/FullScreenHeader';
 import Bread from '@polkadot/extension-polkagate/src/fullscreen/partials/Bread';
 import { Title } from '@polkadot/extension-polkagate/src/fullscreen/sendFund/InputPage';
 import { FULLSCREEN_WIDTH } from '@polkadot/extension-polkagate/src/util/constants';

packages/extension-polkagate/src/fullscreen/stake/solo/index.tsx

@@ -13,7 +13,7 @@ import { useParams } from 'react-router';
 import { useBalances, useFullscreen, useStakingAccount, useTranslation, useUnSupportedNetwork } from '../../../hooks';
 import { FULLSCREEN_WIDTH, STAKING_CHAINS } from '../../../util/constants';
 import { openOrFocusTab } from '../../accountDetails/components/CommonTasks';
-import { FullScreenHeader } from '../../governance/FullScreenHeader';
+import FullScreenHeader from '../../governance/FullScreenHeader';
 import Bread from '../../partials/Bread';
 import { Title } from '../../sendFund/InputPage';
 import Entry from '../Entry';

packages/extension-polkagate/src/popup/authorize/AuthFullScreenMode.tsx

@@ -12,7 +12,7 @@ import React, { useCallback, useContext, useEffect, useMemo, useState } from 're
 import { FULLSCREEN_WIDTH } from '@polkadot/extension-polkagate/src/util/constants';
 
 import { AccountContext, AccountsTable, ActionContext, TwoButtons, VaadinIcon, Warning } from '../../components';
-import { FullScreenHeader } from '../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../fullscreen/governance/FullScreenHeader';
 import { useFavIcon, useFullscreen, useTranslation } from '../../hooks';
 import { approveAuthRequest, getAuthList, ignoreAuthRequest } from '../../messaging';
 import { areArraysEqual, extractBaseUrl } from '../../util/utils';

packages/extension-polkagate/src/popup/import/addWatchOnlyFullScreen/index.tsx

@@ -19,7 +19,7 @@ import keyring from '@polkadot/ui-keyring';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 
 import { AddressInput, GenesisHashOptionsContext, ProxyTable, SelectChain, TwoButtons, VaadinIcon } from '../../../components';
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useApiWithChain, useFullscreen, useTranslation } from '../../../hooks';
 import { createAccountExternal, getMetadata } from '../../../messaging';
 import { Name } from '../../../partials';

packages/extension-polkagate/src/popup/import/attachQrFullScreen/index.tsx

@@ -16,7 +16,7 @@ import { FULLSCREEN_WIDTH } from '@polkadot/extension-polkagate/src/util/constan
 import { QrScanAddress } from '@polkadot/react-qr';
 
 import { AccountNamePasswordCreation, Address, PButton, TwoButtons, VaadinIcon, Warning } from '../../../components';
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useFullscreen, useTranslation } from '../../../hooks';
 import { createAccountExternal, createAccountSuri, createSeed, updateMeta } from '../../../messaging';
 import { Name } from '../../../partials';

packages/extension-polkagate/src/popup/import/importLedger/index.tsx

@@ -6,7 +6,7 @@
 import { Grid } from '@mui/material';
 import React, { useState } from 'react';
 
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useFullscreen } from '../../../hooks';
 import GenericApp from './GenericApp';
 import LedgerOptions from './LedgerOptions';

packages/extension-polkagate/src/popup/import/importProxiedFullScreen/index.tsx

@@ -17,7 +17,7 @@ import { Title } from '@polkadot/extension-polkagate/src/fullscreen/sendFund/Inp
 import { PROFILE_TAGS } from '@polkadot/extension-polkagate/src/hooks/useProfileAccounts';
 
 import { AccountContext, GenesisHashOptionsContext, Label, ProfileInput, SelectChain, TwoButtons, VaadinIcon } from '../../../components';
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useFullscreen, useInfo, useProxiedAccounts, useTranslation } from '../../../hooks';
 import { createAccountExternal, getMetadata, tieAccount, updateMeta } from '../../../messaging';
 import { FULLSCREEN_WIDTH, PROXY_CHAINS, WESTEND_GENESIS_HASH } from '../../../util/constants';

packages/extension-polkagate/src/popup/import/importRawSeedFullScreen/index.tsx

@@ -19,7 +19,7 @@ import { objectSpread } from '@polkadot/util';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 
 import { Address, GenesisHashOptionsContext, InputWithLabel, TextAreaWithLabel, TwoButtons, VaadinIcon, Warning } from '../../../components';
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useFullscreen, useMetadata, useTranslation } from '../../../hooks';
 import { createAccountSuri } from '../../../messaging';
 import { DEFAULT_TYPE } from '../../../util/defaultType';

packages/extension-polkagate/src/popup/import/importSeedFullScreen/index.tsx

@@ -18,7 +18,7 @@ import { FULLSCREEN_WIDTH } from '@polkadot/extension-polkagate/src/util/constan
 import { objectSpread } from '@polkadot/util';
 
 import { Address, GenesisHashOptionsContext, InputWithLabel, SelectChain, TextAreaWithLabel, TwoButtons, VaadinIcon, Warning } from '../../../components';
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useFullscreen, useMetadata, useTranslation } from '../../../hooks';
 import { createAccountSuri, getMetadata, validateSeed } from '../../../messaging';
 import { DEFAULT_TYPE } from '../../../util/defaultType';
@@ -49,11 +49,11 @@ export default function ImportSeed (): React.ReactElement {
   const [path, setPath] = useState<string | null>(null);
   const [showMore, setShowMore] = useState<boolean>(false);
   const [name, setName] = useState<string | null | undefined>();
-  const [password, setPassword] = useState<string | null >();
+  const [password, setPassword] = useState<string | null>();
 
   const chain = useMetadata(account?.genesis, true);
 
-  const showAddress = useMemo(() => !!(account && account.address), [account]);
+  const showAddress = useMemo(() => !!(account?.address), [account]);
 
   useEffect((): void => {
     setGenesis(genesisOptions[1].value as string); // to set the polkadot as the default selected chain

packages/extension-polkagate/src/popup/import/restoreJSONFullScreen/index.tsx

@@ -18,7 +18,7 @@ import { stringToU8a, u8aToString } from '@polkadot/util';
 import { jsonDecrypt, jsonEncrypt } from '@polkadot/util-crypto';
 
 import { Address, InputFileWithLabel, Password, TwoButtons, VaadinIcon, Warning, WrongPasswordAlert } from '../../../components';
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useFullscreen, useTranslation } from '../../../hooks';
 import { batchRestore, jsonGetAccountInfo, jsonRestore, updateMeta } from '../../../messaging';
 import { DEFAULT_TYPE } from '../../../util/defaultType';

packages/extension-polkagate/src/popup/newAccount/createAccountFullScreen/index.tsx

@@ -12,7 +12,7 @@ import { DEFAULT_TYPE } from '@polkadot/extension-polkagate/src/util/defaultType
 
 import { Checkbox2, InputWithLabel, TwoButtons, VaadinIcon } from '../../../components';
 import { setStorage } from '../../../components/Loading';
-import { FullScreenHeader } from '../../../fullscreen/governance/FullScreenHeader';
+import FullScreenHeader from '../../../fullscreen/governance/FullScreenHeader';
 import { useFullscreen, useTranslation } from '../../../hooks';
 import { PROFILE_TAGS } from '../../../hooks/useProfileAccounts';
 import { createAccountSuri, createSeed } from '../../../messaging';