diff --git a/packages/extension-ui/src/Popup/Accounts/Account.tsx b/packages/extension-ui/src/Popup/Accounts/Account.tsx index a5104eb4..63430cd9 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.tsx @@ -90,6 +90,15 @@ function Account ({ address, className, genesisHash, hideBalance, isExternal, is {t('Export Account')} )} + {!isExternal && ( + + {t('Show Account Address')} + + )} {!isExternal && ( , ThemeProps { + className?: string; +} + +function AddressQr ({ className, match: { params: { address } } }: Props): React.ReactElement { + const { t } = useTranslation(); + const onAction = useContext(ActionContext); + + const _goHome = useCallback( + () => onAction('/'), + [onAction] + ); + + + return ( + <> +
('Account QR')}> +
+ +
+
+
+
+
+ +
+
+
+ + + ); +} + +export default withRouter(styled(AddressQr)` + margin-top: 15px; + .actionArea { + padding: 10px 24px; + } + + .movedWarning { + margin-top: 8px; + } +`); diff --git a/packages/extension-ui/src/Popup/index.tsx b/packages/extension-ui/src/Popup/index.tsx index def252f7..dde80ad9 100644 --- a/packages/extension-ui/src/Popup/index.tsx +++ b/packages/extension-ui/src/Popup/index.tsx @@ -42,6 +42,7 @@ import PhishingDetected from './PhishingDetected'; import RestoreJson from './RestoreJson'; import Signing from './Signing'; import Welcome from './Welcome'; +import AddressQr from './AddressQr'; const startSettings = uiSettings.get(); @@ -194,7 +195,10 @@ export default function Popup (): React.ReactElement { {wrapWithErrorBoundary(, 'account-creation')} {wrapWithErrorBoundary(, 'forget-address')} {wrapWithErrorBoundary(, 'export-address')} - {wrapWithErrorBoundary(, 'export-qr-address')} + {wrapWithErrorBoundary(, 'export-qr-address')} + + {wrapWithErrorBoundary(, 'export-address-qr')} + {wrapWithErrorBoundary(, 'export-all-address')} {wrapWithErrorBoundary(, 'import-ledger')} {wrapWithErrorBoundary(, 'import-qr')} diff --git a/packages/extension-ui/src/partials/QrCodeComponent.tsx b/packages/extension-ui/src/partials/QrCodeComponent.tsx index 2a7d6c21..382beca7 100644 --- a/packages/extension-ui/src/partials/QrCodeComponent.tsx +++ b/packages/extension-ui/src/partials/QrCodeComponent.tsx @@ -12,7 +12,8 @@ const QRCodeComponent: React.FC = ({ size = 384, value }) => { justifyContent: 'center', alignItems: 'center', background: 'white', - padding: '10px' }}> + padding: '10px' , + borderRadius:'10px'}}>