Bump deps (#163)
This commit is contained in:
parent
69e4d0639c
commit
0667c80497
16
package.json
16
package.json
@ -12,11 +12,11 @@
|
||||
"yarn": "^1.10.1"
|
||||
},
|
||||
"resolutions": {
|
||||
"@polkadot/api": "^0.93.0-beta.11",
|
||||
"@polkadot/keyring": "^1.4.1",
|
||||
"@polkadot/types": "^0.93.0-beta.11",
|
||||
"@polkadot/util": "^1.4.1",
|
||||
"@polkadot/util-crypto": "^1.4.1",
|
||||
"@polkadot/api": "^0.93.0-beta.19",
|
||||
"@polkadot/keyring": "^1.5.1",
|
||||
"@polkadot/types": "^0.93.0-beta.19",
|
||||
"@polkadot/util": "^1.5.1",
|
||||
"@polkadot/util-crypto": "^1.5.1",
|
||||
"babel-core": "^7.0.0-bridge.0",
|
||||
"typescript": "^3.6.3"
|
||||
},
|
||||
@ -32,8 +32,8 @@
|
||||
"watch": "cd packages/extension && webpack --config webpack.config.js --watch"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.6.0",
|
||||
"@polkadot/dev-react": "^0.31.0-beta.8",
|
||||
"@polkadot/ts": "^0.1.72"
|
||||
"@babel/core": "^7.6.2",
|
||||
"@polkadot/dev-react": "^0.31.1",
|
||||
"@polkadot/ts": "^0.1.73"
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
"author": "Jaco Greeff <jacogr@gmail.com>",
|
||||
"license": "Apache-2",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.6.0",
|
||||
"@babel/runtime": "^7.6.2",
|
||||
"edgeware-node-types": "^1.0.10"
|
||||
},
|
||||
"peerDependencies": {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
"author": "Jaco Greeff <jacogr@gmail.com>",
|
||||
"license": "Apache-2",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.6.0",
|
||||
"@babel/runtime": "^7.6.2",
|
||||
"@polkadot/extension-inject": "^0.11.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
"author": "Jaco Greeff <jacogr@gmail.com>",
|
||||
"license": "Apache-2",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.6.0"
|
||||
"@babel/runtime": "^7.6.2"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@polkadot/api": "*"
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
"author": "Jaco Greeff <jacogr@gmail.com>",
|
||||
"license": "Apache-2",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.6.0",
|
||||
"@babel/runtime": "^7.6.2",
|
||||
"@polkadot/react-identicon": "^0.45.0-beta.13",
|
||||
"@polkadot/react-qr": "^0.45.0-beta.13",
|
||||
"@types/react-router": "^5.0.3",
|
||||
"@types/react-router-dom": "^4.3.5",
|
||||
"react-router": "^5.0.1",
|
||||
"react-router-dom": "^5.0.1"
|
||||
"@types/react-router": "^5.1.0",
|
||||
"@types/react-router-dom": "^5.1.0",
|
||||
"react-router": "^5.1.0",
|
||||
"react-router-dom": "^5.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,8 +2,6 @@
|
||||
// This software may be modified and distributed under the terms
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
import { Prefix } from '@polkadot/util-crypto/address/types';
|
||||
|
||||
import React, { useState } from 'react';
|
||||
import settings from '@polkadot/ui-settings';
|
||||
import { setSS58Format } from '@polkadot/util-crypto';
|
||||
@ -26,10 +24,10 @@ export default function Settings (): React.ReactElement<{}> {
|
||||
|
||||
// FIXME check against index, we need a better solution
|
||||
const _onChangePrefix = (value: string): void => {
|
||||
const prefix = parseInt(value, 10) as Prefix;
|
||||
const prefix = parseInt(value, 10);
|
||||
|
||||
setPrefix(value);
|
||||
setSS58Format((prefix as number) === -1 ? 42 : prefix);
|
||||
setSS58Format(prefix === -1 ? 42 : prefix);
|
||||
|
||||
settings.set({ prefix });
|
||||
};
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
import { AccountJson, AuthorizeRequest, SigningRequest } from '@polkadot/extension/background/types';
|
||||
import { Prefix } from '@polkadot/util-crypto/address/types';
|
||||
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { Route, Switch } from 'react-router';
|
||||
@ -41,7 +40,7 @@ async function requestMediaAccess (): Promise<boolean> {
|
||||
const { prefix } = settings.get();
|
||||
|
||||
// FIXME Duplicated in Settings, horrible...
|
||||
setSS58Format((prefix === -1 ? 42 : prefix) as Prefix);
|
||||
setSS58Format(prefix === -1 ? 42 : prefix);
|
||||
|
||||
export default function Popup (): React.ReactElement<{}> {
|
||||
const [accounts, setAccounts] = useState<null | AccountJson[]>(null);
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
|
||||
import { AccountJson } from '@polkadot/extension/background/types';
|
||||
import { Chain } from '@polkadot/extension-chains/types';
|
||||
import { Prefix } from '@polkadot/util-crypto/address/types';
|
||||
|
||||
import React, { useContext, useEffect, useState } from 'react';
|
||||
import styled from 'styled-components';
|
||||
@ -44,7 +43,7 @@ function recodeAddress (address: string, accounts: AccountJson[], genesisHash?:
|
||||
|
||||
return [
|
||||
// always allow the actual settings to override the display
|
||||
encodeAddress(publicKey, (settings.prefix === -1 ? chain.ss58Format : settings.prefix) as Prefix),
|
||||
encodeAddress(publicKey, settings.prefix === -1 ? chain.ss58Format : settings.prefix),
|
||||
account,
|
||||
chain
|
||||
];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
"author": "Jaco Greeff <jacogr@gmail.com>",
|
||||
"license": "Apache-2",
|
||||
"dependencies": {
|
||||
"@polkadot/api": "^0.93.0-beta.11",
|
||||
"@polkadot/api": "^0.93.0-beta.19",
|
||||
"@polkadot/extension-ui": "^0.11.1",
|
||||
"@polkadot/ui-keyring": "^0.45.0-beta.13"
|
||||
"@polkadot/ui-keyring": "^0.45.0-beta.14"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/runtime": "^7.6.0",
|
||||
"@polkadot/keyring": "^1.4.1",
|
||||
"@types/chrome": "^0.0.88",
|
||||
"@babel/runtime": "^7.6.2",
|
||||
"@polkadot/keyring": "^1.5.1",
|
||||
"@types/chrome": "^0.0.89",
|
||||
"@types/firefox-webext-browser": "^67.0.1",
|
||||
"extensionizer": "^1.0.1",
|
||||
"extract-loader": "^3.1.0",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user