From 7a457911537050a8a0a5377053e6cb724717bf64 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 28 Jan 2021 19:10:12 +0100 Subject: [PATCH] Bump deps (#4522) * Bump deps * latest * Ledger warning --- package.json | 6 +- packages/page-accounts/package.json | 2 +- packages/page-contracts/package.json | 2 +- packages/page-settings/src/General.tsx | 31 +++-- packages/react-api/package.json | 2 +- packages/react-components/package.json | 8 +- yarn.lock | 170 ++++++++++++------------- 7 files changed, 114 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index 0764ecd085..26c9db244d 100644 --- a/package.json +++ b/package.json @@ -12,13 +12,13 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^3.6.5-4", - "@polkadot/api-contract": "^3.6.5-4", + "@polkadot/api": "^3.6.5-6", + "@polkadot/api-contract": "^3.6.5-6", "@polkadot/hw-ledger": "^5.4.4", "@polkadot/keyring": "^5.4.4", "@polkadot/networks": "^5.4.4", "@polkadot/phishing": "^0.4.21", - "@polkadot/types": "^3.6.5-4", + "@polkadot/types": "^3.6.5-6", "@polkadot/util": "^5.4.4", "@polkadot/util-crypto": "^5.4.4", "@polkadot/wasm-crypto": "^3.2.2", diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json index f70dc01852..6f9a9da5bb 100644 --- a/packages/page-accounts/package.json +++ b/packages/page-accounts/package.json @@ -12,7 +12,7 @@ "@babel/runtime": "^7.12.5", "@polkadot/phishing": "^0.4.21", "@polkadot/react-components": "^0.77.2-24", - "@polkadot/vanitygen": "^0.26.3-0", + "@polkadot/vanitygen": "^0.26.3", "detect-browser": "^5.2.0", "file-saver": "^2.0.5" }, diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index 189e14caf7..f1defe7469 100644 --- a/packages/page-contracts/package.json +++ b/packages/page-contracts/package.json @@ -10,6 +10,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", - "@polkadot/api-contract": "^3.6.5-4" + "@polkadot/api-contract": "^3.6.5-6" } } diff --git a/packages/page-settings/src/General.tsx b/packages/page-settings/src/General.tsx index 24483edf6c..d7c8079926 100644 --- a/packages/page-settings/src/General.tsx +++ b/packages/page-settings/src/General.tsx @@ -7,7 +7,7 @@ import type { SettingsStruct } from '@polkadot/ui-settings/types'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { createLanguages, createSs58 } from '@polkadot/apps-config'; -import { Button, Dropdown } from '@polkadot/react-components'; +import { Button, Dropdown, MarkWarning } from '@polkadot/react-components'; import { useLedger } from '@polkadot/react-hooks'; import { settings } from '@polkadot/ui-settings'; @@ -109,17 +109,6 @@ function General ({ className = '' }: Props): React.ReactElement { options={iconOptions} /> - {isLedgerCapable && ( -
- ('Manage your connection to Ledger S')} - label={t('manage hardware connections')} - onChange={_handleChange('ledgerConn')} - options={ledgerConnOptions} - /> -
- )}
{ options={translateLanguages} />
+ {isLedgerCapable && ( + <> +
+ ('Manage your connection to Ledger S')} + label={t('manage hardware connections')} + onChange={_handleChange('ledgerConn')} + options={ledgerConnOptions} + /> +
+ {state.ledgerConn !== 'none' && ( +
+ ('Ledger support is still experimental and some issues may remain. Trust, but verify the addresses on your devices before transferring large amounts. There are some features that will not work, including batch calls (used extensively in staking and democracy) as well as any identity operations.')} /> +
+ )} + + )}