diff --git a/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx b/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx index 116c08ed4f4..dac0f97e3bb 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx @@ -70,7 +70,7 @@ describe('Create Account', () => { it('clicking on Next activates phase 2', () => { check(wrapper.find('input[type="checkbox"]')); wrapper.find('button').simulate('click'); - expect(wrapper.find(CreationStep).text()).toBe('Create an account:2/2Cancel'); + expect(wrapper.find(CreationStep).text()).toBe('Create an account:2/2Back'); }); }); diff --git a/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx b/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx index b4bc524baae..35b84e3d7df 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx @@ -20,7 +20,7 @@ function CreationStep ({ step, onClick, className }: Props): React.ReactElement< {step} /2 - + ); } diff --git a/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx b/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx index b47dccfd0da..c52ff146aee 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx @@ -19,16 +19,6 @@ const onCopy = (): void => { document.execCommand('copy'); }; -const onPrint = (seed: string) => (): void => { - const tab = window.open('about:blank', 'blank', 'width=800,height=600'); - if (!tab) { - return; - } - tab.document.write(seed); - tab.print(); - tab.close(); -}; - function Mnemonic ({ seed, onNextStep }: Props): React.ReactElement { const [isMnemonicSaved, setIsMnemonicSaved] = useState(false); return ( @@ -40,7 +30,6 @@ function Mnemonic ({ seed, onNextStep }: Props): React.ReactElement { }
- Cancel + Reject ); @@ -114,7 +114,7 @@ const CancelButton = styled(ActionBar)` margin-top: 4px; margin-bottom: 4px; text-decoration: underline; - + a { margin: auto; } diff --git a/packages/extension-ui/src/Popup/Signing/Signing.test.tsx b/packages/extension-ui/src/Popup/Signing/Signing.test.tsx index a3c7abfefec..e4d143a2430 100644 --- a/packages/extension-ui/src/Popup/Signing/Signing.test.tsx +++ b/packages/extension-ui/src/Popup/Signing/Signing.test.tsx @@ -235,7 +235,7 @@ describe('Signing requests', () => { emitter.emit('request', [signRequests[0]]); }); wrapper.update(); - expect(wrapper.find(TransactionIndex).text()).toBe('Transaction:1/1'); + expect(wrapper.find(TransactionIndex).text()).toBe(''); expect(wrapper.find(Request).prop('signId')).toBe(signRequests[0].id); }); }); diff --git a/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx b/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx index 06131d58eb8..e2802fe40f7 100644 --- a/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx +++ b/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx @@ -21,15 +21,18 @@ function TransactionIndex ({ index, totalItems, onNextClick, onPreviousClick, cl return (
-
- - {index + 1} - /{totalItems} -
-
- previousClickActive && onPreviousClick()} isActive={previousClickActive} /> - nextClickActive && onNextClick()} isActive={nextClickActive} /> -
+ {totalItems > 1 && ( + <> +
+ + {index + 1} + /{totalItems} +
+
+ previousClickActive && onPreviousClick()} isActive={previousClickActive} /> + nextClickActive && onNextClick()} isActive={nextClickActive} /> +
+ )}
); } diff --git a/packages/extension-ui/src/assets/print.svg b/packages/extension-ui/src/assets/print.svg deleted file mode 100644 index a666fcef18a..00000000000 --- a/packages/extension-ui/src/assets/print.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/extension-ui/src/components/MnemonicSeed.tsx b/packages/extension-ui/src/components/MnemonicSeed.tsx index 296d01b3330..091fa913ec9 100644 --- a/packages/extension-ui/src/components/MnemonicSeed.tsx +++ b/packages/extension-ui/src/components/MnemonicSeed.tsx @@ -7,16 +7,14 @@ import React, { MouseEventHandler } from 'react'; import TextAreaWithLabel from './TextAreaWithLabel'; import ActionText from '@polkadot/extension-ui/components/ActionText'; import copy from '../assets/copy.svg'; -import print from '../assets/print.svg'; interface Props { seed: string; onCopy: MouseEventHandler; - onPrint: MouseEventHandler; className?: string; } -function MnemonicSeed ({ seed, onCopy, onPrint, className }: Props): React.ReactElement { +function MnemonicSeed ({ seed, onCopy, className }: Props): React.ReactElement { return (
@@ -27,12 +25,6 @@ function MnemonicSeed ({ seed, onCopy, onPrint, className }: Props): React.React text='Copy to clipboard' onClick={onCopy} /> -
); @@ -41,7 +33,7 @@ function MnemonicSeed ({ seed, onCopy, onPrint, className }: Props): React.React const MnemonicText = styled(TextAreaWithLabel).attrs(() => ({ label: 'Generated 12-word mnemonic seed:', isReadOnly: true -}))` +}))` textarea { font-size: ${({ theme }): string => theme.fontSize}; line-height: ${({ theme }): string => theme.lineHeight}; @@ -56,7 +48,7 @@ const MnemonicText = styled(TextAreaWithLabel).attrs(() => ({ const ButtonsRow = styled.div` display: flex; flex-direction: row; - + ${ActionText} { margin-right: 32px; }