diff --git a/packages/extension-ui/src/Popup/Accounts/Account.test.tsx b/packages/extension-ui/src/Popup/Accounts/Account.test.tsx index 1a3d06e7e4..e1fe94e6e5 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.test.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.test.tsx @@ -21,7 +21,8 @@ describe('Account component', () => { + {...{ address: VALID_ADDRESS, ...additionalAccountProperties }} + > ); diff --git a/packages/extension-ui/src/Popup/Accounts/Account.tsx b/packages/extension-ui/src/Popup/Accounts/Account.tsx index f2c833ae18..dd15d0c636 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.tsx @@ -33,32 +33,34 @@ function Account ({ address, className, isExternal }: Props): React.ReactElement _toggleEdit(); }; - return
-
- - Rename - - {!isExternal && Export Account} - Forget Account - - } - > - {isEditing && ( - - )} -
-
; + return ( +
+
+ + Rename + + {!isExternal && Export Account} + Forget Account + + )} + > + {isEditing && ( + + )} +
+
+ ); } const MenuGroup = styled.div` diff --git a/packages/extension-ui/src/Popup/Accounts/index.tsx b/packages/extension-ui/src/Popup/Accounts/index.tsx index f1d7bffb5d..836bdf0363 100644 --- a/packages/extension-ui/src/Popup/Accounts/index.tsx +++ b/packages/extension-ui/src/Popup/Accounts/index.tsx @@ -26,10 +26,10 @@ export default function Accounts (): React.ReactElement { const mediaAllowed = useContext(MediaContext); return ( <> -
+
{ (accounts.length === 0) - ? + ? : ( <> @@ -39,18 +39,27 @@ export default function Accounts (): React.ReactElement { )) + /> + )) } ) } - - + + {mediaAllowed && ( - + )} diff --git a/packages/extension-ui/src/Popup/Authorize/Authorize.test.tsx b/packages/extension-ui/src/Popup/Authorize/Authorize.test.tsx index 81f306a679..9c98d7b1ad 100644 --- a/packages/extension-ui/src/Popup/Authorize/Authorize.test.tsx +++ b/packages/extension-ui/src/Popup/Authorize/Authorize.test.tsx @@ -18,7 +18,7 @@ describe('Authorize', () => { const mountAuthorize = (authorizeRequests: AuthorizeRequest[] = []): ReactWrapper => mount( - + ); diff --git a/packages/extension-ui/src/Popup/Authorize/Request.tsx b/packages/extension-ui/src/Popup/Authorize/Request.tsx index 79988cd6e6..ca1032ef8f 100644 --- a/packages/extension-ui/src/Popup/Authorize/Request.tsx +++ b/packages/extension-ui/src/Popup/Authorize/Request.tsx @@ -34,7 +34,16 @@ function Request ({ authId, className, isFirst, request: { origin }, url }: Prop -
An application, self-identifying as {origin} is requesting access from {url}.
+
+ An application, self-identifying as {origin} is requesting access from{' '} + + {url} + . +
{isFirst && ( <> diff --git a/packages/extension-ui/src/Popup/Authorize/index.tsx b/packages/extension-ui/src/Popup/Authorize/index.tsx index 922accb7de..3c80cc8b82 100644 --- a/packages/extension-ui/src/Popup/Authorize/index.tsx +++ b/packages/extension-ui/src/Popup/Authorize/index.tsx @@ -22,7 +22,7 @@ export default function Authorize (): React.ReactElement<{}> { url={url} /> ))} - + ); } diff --git a/packages/extension-ui/src/Popup/CreateAccount/AccountName.tsx b/packages/extension-ui/src/Popup/CreateAccount/AccountName.tsx index 6f372f12f7..0a5594ff0b 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/AccountName.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/AccountName.tsx @@ -15,29 +15,31 @@ function AccountName ({ onCreate, address }: Props): React.ReactElement { const [name, setName] = useState(null); const [password, setPassword] = useState(null); - return <> - - {name && } - {name && password && ( - <> -
- - - - - - )} - ; + + + + )} + + ); } export default AccountName; diff --git a/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx b/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx index 4efeed0ed6..3dff16baf7 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/CreateAccount.test.tsx @@ -33,7 +33,7 @@ describe('Create Account', () => { const mountComponent = (): ReactWrapper => mount( - + ); diff --git a/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx b/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx index 201ee2846d..b4bc524baa 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/CreationStep.tsx @@ -13,14 +13,16 @@ interface Props { } function CreationStep ({ step, onClick, className }: Props): React.ReactElement { - return
-
- - {step} - /2 + return ( +
+
+ + {step} + /2 +
+
- -
; + ); } const CreateAnAccount = styled(Title).attrs(() => ({ diff --git a/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx b/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx index 1701ea8c1c..b47dccfd0d 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx @@ -31,18 +31,28 @@ const onPrint = (seed: string) => (): void => { function Mnemonic ({ seed, onNextStep }: Props): React.ReactElement { const [isMnemonicSaved, setIsMnemonicSaved] = useState(false); - return <> - - Please write down your wallet’s mnemonic seed and keep it in a safe place.
+ return ( + <> + + Please write down your wallet’s mnemonic seed and keep it in a safe place.
Mnemonic seed is used to restore your wallet. Keep it carefully in case you lose your assets. -
- - - - - - - ; +
+ + + + + + + + ); } export default Mnemonic; diff --git a/packages/extension-ui/src/Popup/CreateAccount/index.tsx b/packages/extension-ui/src/Popup/CreateAccount/index.tsx index bfd100722d..d3f43bf961 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/index.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/index.tsx @@ -43,12 +43,12 @@ export default function CreateAccount (): React.ReactElement { return ( <> -
- +
+ {account && (step === 1 ? ( - + ) : ( - + ))} ); diff --git a/packages/extension-ui/src/Popup/Export.test.tsx b/packages/extension-ui/src/Popup/Export.test.tsx index 5b70a680a5..fb46adea6b 100644 --- a/packages/extension-ui/src/Popup/Export.test.tsx +++ b/packages/extension-ui/src/Popup/Export.test.tsx @@ -28,12 +28,13 @@ describe('Export component', () => { beforeEach(() => { jest.spyOn(messaging, 'exportAccount').mockResolvedValue({ exportedJson: '{ "meta": { "name": "account_name" } }' }); - wrapper = mount( - - - - ); + wrapper = mount( + + + + + + ); }); it('creates export message on button press', async () => { diff --git a/packages/extension-ui/src/Popup/ImportQr.tsx b/packages/extension-ui/src/Popup/ImportQr.tsx index 20b4fd4315..c33f2a2dd8 100644 --- a/packages/extension-ui/src/Popup/ImportQr.tsx +++ b/packages/extension-ui/src/Popup/ImportQr.tsx @@ -27,9 +27,9 @@ export default function ImportQr (): React.ReactElement { return ( <> -
+
- onAction('/')}/> + onAction('/')} /> {!account && (
@@ -46,7 +46,7 @@ export default function ImportQr (): React.ReactElement { {...account} name={name} /> - + {name && ( diff --git a/packages/extension-ui/src/Popup/Signing/Qr.tsx b/packages/extension-ui/src/Popup/Signing/Qr.tsx index c270ebf815..6638f51825 100644 --- a/packages/extension-ui/src/Popup/Signing/Qr.tsx +++ b/packages/extension-ui/src/Popup/Signing/Qr.tsx @@ -33,11 +33,13 @@ function Qr ({ className, onSignature, payload, request }: Props): React.ReactEl
{isScanning ? - : + : ( + + ) } {!isScanning && ( diff --git a/packages/extension-ui/src/Popup/Signing/Request.tsx b/packages/extension-ui/src/Popup/Signing/Request.tsx index bdaad2477f..eb989fbec2 100644 --- a/packages/extension-ui/src/Popup/Signing/Request.tsx +++ b/packages/extension-ui/src/Popup/Signing/Request.tsx @@ -54,17 +54,21 @@ export default function Request ({ account: { isExternal }, request, signId, url genesisHash={request.genesisHash} /> {isExternal - ? - :
+ ? ( + + ) + : ( +
+ ) } {!isExternal && } diff --git a/packages/extension-ui/src/Popup/Signing/Signing.test.tsx b/packages/extension-ui/src/Popup/Signing/Signing.test.tsx index c504c0cae1..18f86a86cd 100644 --- a/packages/extension-ui/src/Popup/Signing/Signing.test.tsx +++ b/packages/extension-ui/src/Popup/Signing/Signing.test.tsx @@ -53,7 +53,7 @@ describe('Signing requests', () => { return ( - + ); } @@ -62,7 +62,7 @@ describe('Signing requests', () => { - + diff --git a/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx b/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx index e2e2fd2071..06131d58eb 100644 --- a/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx +++ b/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx @@ -19,17 +19,19 @@ function TransactionIndex ({ index, totalItems, onNextClick, onPreviousClick, cl const previousClickActive = index !== 0; const nextClickActive = index < totalItems - 1; - return
-
- - {index + 1} - /{totalItems} + return ( +
+
+ + {index + 1} + /{totalItems} +
+
+ previousClickActive && onPreviousClick()} isActive={previousClickActive} /> + nextClickActive && onNextClick()} isActive={nextClickActive} /> +
-
- previousClickActive && onPreviousClick()} isActive={previousClickActive}/> - nextClickActive && onNextClick()} isActive={nextClickActive}/> -
-
; + ); } const Transaction = styled(Title).attrs(() => ({ diff --git a/packages/extension-ui/src/Popup/Signing/index.tsx b/packages/extension-ui/src/Popup/Signing/index.tsx index bcd6380453..2140a52386 100644 --- a/packages/extension-ui/src/Popup/Signing/index.tsx +++ b/packages/extension-ui/src/Popup/Signing/index.tsx @@ -19,7 +19,7 @@ export default function Signing (): React.ReactElement<{}> { return requests[requestIndex] ? ( <> -
+
{ url={requests[requestIndex].url} /> - ) : ; + ) : ; } diff --git a/packages/extension-ui/src/Popup/Welcome.tsx b/packages/extension-ui/src/Popup/Welcome.tsx index 3fbacf5bab..947e5da8b3 100644 --- a/packages/extension-ui/src/Popup/Welcome.tsx +++ b/packages/extension-ui/src/Popup/Welcome.tsx @@ -19,8 +19,8 @@ export default function Welcome (): React.ReactElement { return ( <> -
- +
+ Before we start, just a couple of notes regarding use: @@ -30,7 +30,7 @@ export default function Welcome (): React.ReactElement { ... we are not in the information collection business (even anonymized). - + diff --git a/packages/extension-ui/src/assets/images.d.ts b/packages/extension-ui/src/assets/images.d.ts index 67d9d58c7b..e4004a5cc0 100644 --- a/packages/extension-ui/src/assets/images.d.ts +++ b/packages/extension-ui/src/assets/images.d.ts @@ -1,4 +1,6 @@ -/* eslint-disable import/export,import/no-default-export */ +// Copyright 2019 @polkadot/extension-ui authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. declare module '*.svg' { const url: string; diff --git a/packages/extension-ui/src/components/ActionText.tsx b/packages/extension-ui/src/components/ActionText.tsx index 826fe0eb58..3c51a0542d 100644 --- a/packages/extension-ui/src/components/ActionText.tsx +++ b/packages/extension-ui/src/components/ActionText.tsx @@ -16,7 +16,7 @@ interface Props { function ActionText ({ icon, className, text, onClick }: Props): React.ReactElement { return (
- {icon && } + {icon && } {text}
); diff --git a/packages/extension-ui/src/components/AddAccount.tsx b/packages/extension-ui/src/components/AddAccount.tsx index 18df081c74..ffc5807a2a 100644 --- a/packages/extension-ui/src/components/AddAccount.tsx +++ b/packages/extension-ui/src/components/AddAccount.tsx @@ -16,7 +16,11 @@ function AddAccount ({ className }: Props): React.ReactElement { return (
- add account onAction('/account/create')}/> + add account onAction('/account/create')} + />

Add Account

You currently don't have any accounts. Either create a new account or if you have an existing account you wish to use, import it with the seed phrase. diff --git a/packages/extension-ui/src/components/Address.tsx b/packages/extension-ui/src/components/Address.tsx index df47252517..0f6d553eec 100644 --- a/packages/extension-ui/src/components/Address.tsx +++ b/packages/extension-ui/src/components/Address.tsx @@ -75,28 +75,31 @@ function Address ({ address, className, children, genesisHash, name, actions }: const theme = ((chain && chain.icon) || 'polkadot') as 'polkadot'; - return
-
- - - - {name || (account && account.name) || ''} - {formatted || ''} - - {actions && - <> - setShowActionsMenu(!showActionsMenu)} ref={actionsRef}> - {showActionsMenu ? : } - - {showActionsMenu && {actions}} - } - - {children} + return ( +
+
+ + + + {name || (account && account.name) || ''} + {formatted || ''} + + {actions && ( + <> + setShowActionsMenu(!showActionsMenu)} ref={actionsRef}> + {showActionsMenu ? : } + + {showActionsMenu && {actions}} + + )} + + {children} +
-
; + ); } export const AccountInfoRow = styled.div` diff --git a/packages/extension-ui/src/components/Button.tsx b/packages/extension-ui/src/components/Button.tsx index ac827b81ef..ed5e786b1b 100644 --- a/packages/extension-ui/src/components/Button.tsx +++ b/packages/extension-ui/src/components/Button.tsx @@ -28,7 +28,11 @@ function Button ({ children, className, isDisabled, onClick, to }: Props): React }; return ( - ); diff --git a/packages/extension-ui/src/components/ButtonWithSubtitle.tsx b/packages/extension-ui/src/components/ButtonWithSubtitle.tsx index c2073f3f74..d461decf3a 100644 --- a/packages/extension-ui/src/components/ButtonWithSubtitle.tsx +++ b/packages/extension-ui/src/components/ButtonWithSubtitle.tsx @@ -1,3 +1,7 @@ +// Copyright 2019 @polkadot/extension-ui authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + import React from 'react'; import { Button } from '.'; import styled from 'styled-components'; diff --git a/packages/extension-ui/src/components/Checkbox.tsx b/packages/extension-ui/src/components/Checkbox.tsx index aed6ce45f5..0a8eaae317 100644 --- a/packages/extension-ui/src/components/Checkbox.tsx +++ b/packages/extension-ui/src/components/Checkbox.tsx @@ -14,13 +14,19 @@ interface Props { } function Checkbox ({ onChange, label, className, checked }: Props): React.ReactElement { - return
- -
; + return ( +
+ +
+ ); } export default styled(Checkbox)` diff --git a/packages/extension-ui/src/components/Fonts.ts b/packages/extension-ui/src/components/Fonts.ts index 8c2534c4ce..e876aebf87 100644 --- a/packages/extension-ui/src/components/Fonts.ts +++ b/packages/extension-ui/src/components/Fonts.ts @@ -1,3 +1,7 @@ +// Copyright 2019 @polkadot/extension-ui authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + import { createGlobalStyle } from 'styled-components'; import NunitoregularWoff2 from '../assets/fonts/Nunitoregular.woff2'; import NunitoregularWoff from '../assets/fonts/Nunitoregular.woff'; diff --git a/packages/extension-ui/src/components/Header.tsx b/packages/extension-ui/src/components/Header.tsx index 72fb9cbf19..eb8585e788 100644 --- a/packages/extension-ui/src/components/Header.tsx +++ b/packages/extension-ui/src/components/Header.tsx @@ -30,15 +30,16 @@ function Header ({ children, className, showSettings }: Props): React.ReactEleme polkadot - {showSettings && + {showSettings && ( setShowActionsMenu(!showActionsMenu)}> - + - } - {showActionsMenu && -
- -
} + )} + {showActionsMenu && ( +
+ +
+ )} {children}
diff --git a/packages/extension-ui/src/components/Identicon.tsx b/packages/extension-ui/src/components/Identicon.tsx index cbf4c52065..36d91d64bd 100644 --- a/packages/extension-ui/src/components/Identicon.tsx +++ b/packages/extension-ui/src/components/Identicon.tsx @@ -13,14 +13,16 @@ interface Props { } function Identicon ({ iconTheme, className, value }: Props): React.ReactElement { - return
- -
; + return ( +
+ +
+ ); } export default styled(Identicon)` diff --git a/packages/extension-ui/src/components/Link.tsx b/packages/extension-ui/src/components/Link.tsx index 217dce058d..adb9a25a19 100644 --- a/packages/extension-ui/src/components/Link.tsx +++ b/packages/extension-ui/src/components/Link.tsx @@ -16,9 +16,23 @@ interface Props { function Link ({ children, className, onClick, to }: Props): React.ReactElement { return ( - to - ? {children} - : {children} + to ? ( + + {children} + + ) : ( + + {children} + + ) ); } diff --git a/packages/extension-ui/src/components/List.tsx b/packages/extension-ui/src/components/List.tsx index 50bb85c586..ae66dceb5b 100644 --- a/packages/extension-ui/src/components/List.tsx +++ b/packages/extension-ui/src/components/List.tsx @@ -1,3 +1,7 @@ +// Copyright 2019 @polkadot/extension-ui authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + import styled from 'styled-components'; export default styled.ul` diff --git a/packages/extension-ui/src/components/Menu.tsx b/packages/extension-ui/src/components/Menu.tsx index e7dfce2be1..662e793112 100644 --- a/packages/extension-ui/src/components/Menu.tsx +++ b/packages/extension-ui/src/components/Menu.tsx @@ -11,9 +11,11 @@ interface Props { } function Menu ({ children, className }: Props): React.ReactElement { - return
- {children} -
; + return ( +
+ {children} +
+ ); } export default styled(Menu)` diff --git a/packages/extension-ui/src/components/MnemonicSeed.tsx b/packages/extension-ui/src/components/MnemonicSeed.tsx index 2ecc74bf49..2c35db2ef5 100644 --- a/packages/extension-ui/src/components/MnemonicSeed.tsx +++ b/packages/extension-ui/src/components/MnemonicSeed.tsx @@ -9,6 +9,35 @@ 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 { + return ( +
+ + + + + +
+ ); +} + const MnemonicText = styled(TextAreaWithLabel).attrs(() => ({ label: 'Generated 12-word mnemonic seed:', isReadOnly: true @@ -23,13 +52,6 @@ const MnemonicText = styled(TextAreaWithLabel).attrs(() => ({ } `; -interface Props { - seed: string; - onCopy: MouseEventHandler; - onPrint: MouseEventHandler; - className?: string; -} - const ButtonsRow = styled.div` display: flex; flex-direction: row; @@ -39,16 +61,6 @@ const ButtonsRow = styled.div` } `; -function MnemonicSeed ({ seed, onCopy, onPrint, className }: Props): React.ReactElement { - return
- - - - - -
; -} - export default styled(MnemonicSeed)` margin-top: 21px; `; diff --git a/packages/extension-ui/src/components/Settings.tsx b/packages/extension-ui/src/components/Settings.tsx index 4dee2df712..c61a0524de 100644 --- a/packages/extension-ui/src/components/Settings.tsx +++ b/packages/extension-ui/src/components/Settings.tsx @@ -55,7 +55,11 @@ export default function Settings (): React.ReactElement { External QR accounts and Access - + Display address format For: diff --git a/packages/extension-ui/src/components/TextInputs.ts b/packages/extension-ui/src/components/TextInputs.ts index ea8be90314..820861f802 100644 --- a/packages/extension-ui/src/components/TextInputs.ts +++ b/packages/extension-ui/src/components/TextInputs.ts @@ -1,3 +1,7 @@ +// Copyright 2019 @polkadot/extension-ui authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + import styled, { css } from 'styled-components'; interface Props { diff --git a/packages/extension-ui/src/components/Warning.tsx b/packages/extension-ui/src/components/Warning.tsx index e6c35ac90c..c751c28fbe 100644 --- a/packages/extension-ui/src/components/Warning.tsx +++ b/packages/extension-ui/src/components/Warning.tsx @@ -14,14 +14,16 @@ interface Props { } function Warning ({ children, className, danger }: Props): React.ReactElement { - return
-
- + return ( +
+
+ +
+
+ {children} +
-
- {children} -
-
; + ); } const WarningImage = styled(Svg)>` diff --git a/packages/extension-ui/src/createView.tsx b/packages/extension-ui/src/createView.tsx index e507c9a444..8e25ef5238 100644 --- a/packages/extension-ui/src/createView.tsx +++ b/packages/extension-ui/src/createView.tsx @@ -1,4 +1,4 @@ -// Copyright 2019 @polkadot/extension authors & contributors +// Copyright 2019 @polkadot/extension-ui authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. @@ -17,11 +17,11 @@ export default function createView (Entry: React.ComponentType, rootId = 'root') ReactDOM.render( - + - + diff --git a/packages/extension-ui/src/partials/Back.tsx b/packages/extension-ui/src/partials/Back.tsx index e4f4ddf9fd..4853945994 100644 --- a/packages/extension-ui/src/partials/Back.tsx +++ b/packages/extension-ui/src/partials/Back.tsx @@ -16,7 +16,7 @@ function Back ({ className, to = '/' }: Props): React.ReactElement { return (
- + Back