From 4a2768cee835d25524b506b99de8772b37cf5d7d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 22 May 2019 13:16:40 +0200 Subject: [PATCH] Display genesis (or chain, if known), update deps (#19) * Display genesis (or chain, if known), update deps * Build optimizations --- package.json | 5 +- packages/extension-ui/package.json | 2 +- .../src/Popup/Signing/Details.tsx | 10 +- .../src/Popup/Signing/Request.tsx | 3 +- .../extension-ui/src/Popup/Signing/Unlock.tsx | 2 +- packages/extension-ui/src/components/Box.tsx | 3 +- .../extension-ui/src/components/Header.tsx | 1 + .../extension-ui/src/components/defaults.ts | 1 + packages/extension/package.json | 4 +- packages/extension/public/popup.html | 2 +- packages/extension/src/background/types.ts | 1 + packages/extension/src/chains.ts | 18 + packages/extension/src/inject/Signer.ts | 14 +- packages/extension/webpack.config.js | 18 +- yarn.lock | 3499 +++++------------ 15 files changed, 1107 insertions(+), 2476 deletions(-) create mode 100644 packages/extension/src/chains.ts diff --git a/package.json b/package.json index 3bcb8a86..9d282227 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "packages/*" ], "engines": { - "node": ">=10.13.0", "yarn": "^1.10.1" }, "resolutions": { @@ -27,8 +26,8 @@ "watch": "cd packages/extension && webpack --config webpack.config.js --watch" }, "devDependencies": { - "@babel/core": "^7.4.4", - "@polkadot/dev-react": "^0.30.0-beta.4", + "@babel/core": "^7.4.5", + "@polkadot/dev-react": "^0.30.0-beta.5", "@polkadot/ts": "^0.1.56" } } diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json index 5d6ee854..22545ec5 100644 --- a/packages/extension-ui/package.json +++ b/packages/extension-ui/package.json @@ -5,7 +5,7 @@ "author": "Jaco Greeff ", "license": "Apache-2", "dependencies": { - "@polkadot/ui-identicon": "^0.39.0-beta.5", + "@polkadot/ui-identicon": "^0.39.1", "@types/react-router": "^5.0.0", "@types/react-router-dom": "^4.3.3", "react-router": "^5.0.0", diff --git a/packages/extension-ui/src/Popup/Signing/Details.tsx b/packages/extension-ui/src/Popup/Signing/Details.tsx index 21d61216..5d74029b 100644 --- a/packages/extension-ui/src/Popup/Signing/Details.tsx +++ b/packages/extension-ui/src/Popup/Signing/Details.tsx @@ -4,15 +4,19 @@ import React from 'react'; import styled from 'styled-components'; +import findChain from '@polkadot/extension/chains'; type Props = { className?: string, + genesisHash: string, method: string, nonce: string, url: string }; -function Details ({ className, method, nonce, url }: Props) { +function Details ({ className, genesisHash, method, nonce, url }: Props) { + const chain = findChain(genesisHash); + return ( @@ -20,6 +24,10 @@ function Details ({ className, method, nonce, url }: Props) { + + + + diff --git a/packages/extension-ui/src/Popup/Signing/Request.tsx b/packages/extension-ui/src/Popup/Signing/Request.tsx index ac9afa11..812c2db3 100644 --- a/packages/extension-ui/src/Popup/Signing/Request.tsx +++ b/packages/extension-ui/src/Popup/Signing/Request.tsx @@ -20,7 +20,7 @@ type Props = { url: string }; -function Request ({ isFirst, onAction, request: { address, method, nonce }, signId, url }: Props) { +function Request ({ isFirst, onAction, request: { address, genesisHash, method, nonce }, signId, url }: Props) { const onCancel = (): void => { cancelRequest(signId) .then(() => onAction()) @@ -32,6 +32,7 @@ function Request ({ isFirst, onAction, request: { address, method, nonce }, sign return (
from {url}
{chain ? 'chain' : 'genesis'}{chain || genesisHash}
nonce {nonce}