diff --git a/package.json b/package.json index ea7fe083da..f09d64bd38 100644 --- a/package.json +++ b/package.json @@ -12,18 +12,18 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^5.6.2-4", - "@polkadot/api-contract": "^5.6.2-4", - "@polkadot/hw-ledger": "^7.2.1", - "@polkadot/keyring": "^7.2.1", - "@polkadot/networks": "^7.2.1", + "@polkadot/api": "^5.6.2-7", + "@polkadot/api-contract": "^5.6.2-7", + "@polkadot/hw-ledger": "^7.2.2-7", + "@polkadot/keyring": "^7.2.2-7", + "@polkadot/networks": "^7.2.2-7", "@polkadot/phishing": "^0.6.266", - "@polkadot/types": "^5.6.2-4", - "@polkadot/types-known": "^5.6.2-4", - "@polkadot/types-support": "^5.6.2-4", - "@polkadot/util": "^7.2.1", - "@polkadot/util-crypto": "^7.2.1", - "@polkadot/wasm-crypto": "^4.1.2", + "@polkadot/types": "^5.6.2-7", + "@polkadot/types-known": "^5.6.2-7", + "@polkadot/types-support": "^5.6.2-7", + "@polkadot/util": "^7.2.2-7", + "@polkadot/util-crypto": "^7.2.2-7", + "@polkadot/wasm-crypto": "^4.1.3-7", "babel-core": "^7.0.0-bridge.0", "styled-components": "^5.2.0", "typescript": "^4.3.5" @@ -73,8 +73,8 @@ "@babel/runtime": "^7.15.3", "@crustio/crust-pin": "^0.0.1", "@pinata/sdk": "^1.1.23", - "@polkadot/dev": "^0.62.61", - "@polkadot/ts": "^0.4.5", + "@polkadot/dev": "^0.62.62", + "@polkadot/ts": "^0.4.6", "@types/bn.js": "^4.11.6", "@types/chart.js": "^2.9.34", "@types/file-saver": "^2.0.3", @@ -84,7 +84,7 @@ "@types/react-dom": "^17.0.9", "@types/react-router-dom": "^5.1.8", "@types/store": "^2.0.2", - "@types/styled-components": "^5.1.12", + "@types/styled-components": "^5.1.13", "@types/styled-theming": "^2.2.5", "concurrently": "^6.2.1", "devtron": "^1.4.0", @@ -97,11 +97,11 @@ "react-dom": "^17.0.2", "react-is": "^17.0.2", "source-map-explorer": "^2.5.2", - "styled-components": "^5.3.0", + "styled-components": "^5.3.1", "stylelint": "^13.13.1", "stylelint-config-recommended": "^5.0.0", "stylelint-config-styled-components": "^0.1.1", - "webpack": "^5.50.0", + "webpack": "^5.51.1", "webpack-cli": "^4.8.0" }, "packageManager": "yarn@3.0.1" diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 720348c42e..5bc4868d62 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -9,26 +9,26 @@ "dependencies": { "@acala-network/type-definitions": "2.1.1", "@babel/runtime": "^7.15.3", - "@bifrost-finance/type-definitions": "1.2.12", + "@bifrost-finance/type-definitions": "1.2.13", "@crustio/type-definitions": "0.0.10", - "@darwinia/types": "1.1.6", - "@digitalnative/type-definitions": "1.1.11", + "@darwinia/types": "1.1.7", + "@digitalnative/type-definitions": "1.1.12", "@docknetwork/node-types": "0.4.7", "@edgeware/node-types": "3.6.2-wako", - "@equilab/definitions": "1.3.1", - "@interlay/interbtc-types": "0.10.1", + "@equilab/definitions": "1.3.6", + "@interlay/interbtc-types": "0.10.2", "@kiltprotocol/type-definitions": "0.1.14", "@laminar/type-definitions": "0.3.1", "@parallel-finance/type-definitions": "1.1.1", "@phala/typedefs": "0.2.14", - "@polkadot/networks": "^7.2.1", + "@polkadot/networks": "^7.2.2-7", "@polymathnetwork/polymesh-types": "0.0.2", "@snowfork/snowbridge-types": "0.2.5", - "@sora-substrate/type-definitions": "1.5.2", + "@sora-substrate/type-definitions": "1.5.10", "@subsocial/types": "0.6.1-1", "@zeitgeistpm/type-defs": "0.2.5", "moonbeam-types-bundle": "1.2.4", - "pontem-types-bundle": "1.0.5", + "pontem-types-bundle": "1.0.8", "rxjs": "^7.3.0" }, "devDependencies": { diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 924a753791..1efd865deb 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -150,7 +150,7 @@ const spec: Record = { 'hack-hydra-dx': hydrate, halongbay: polkafoundry, hanonycash, - heiko: { ...parallel }, + heiko: parallel, 'hydra-dx': hydrate, idavoll, 'integritee-parachain': integritee, diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index 6e954a08a9..41a28c69ae 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -6,7 +6,7 @@ "dependencies": { "@babel/core": "^7.15.0", "@babel/polyfill": "^7.12.1", - "@polkadot/dev": "^0.62.61", + "@polkadot/dev": "^0.62.62", "@polkadot/react-components": "^0.95.2-41", "electron-log": "^4.3.5", "electron-updater": "^4.3.10" @@ -21,6 +21,6 @@ "react-dom": "^17.0.2", "thread-loader": "^3.0.4", "tmp": "^0.2.1", - "webpack": "^5.50.0" + "webpack": "^5.51.1" } } diff --git a/packages/apps/package.json b/packages/apps/package.json index 1b1afab38e..cf6af6cf59 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -11,7 +11,7 @@ "@babel/runtime": "^7.15.3", "@polkadot/apps-config": "^0.95.2-41", "@polkadot/apps-routing": "^0.95.2-41", - "@polkadot/dev": "^0.62.61", + "@polkadot/dev": "^0.62.62", "@polkadot/react-api": "^0.95.2-41", "@polkadot/react-components": "^0.95.2-41", "@polkadot/react-hooks": "^0.95.2-41", @@ -39,7 +39,7 @@ "process": "^0.11.10", "stream-browserify": "^3.0.0", "url-loader": "^4.1.1", - "webpack": "^5.50.0", + "webpack": "^5.51.1", "webpack-cli": "^4.8.0", "webpack-dev-server": "^4.0.0-rc.0", "webpack-merge": "^5.8.0" diff --git a/packages/apps/src/Endpoints/index.tsx b/packages/apps/src/Endpoints/index.tsx index bd3569006b..cec9c2827b 100644 --- a/packages/apps/src/Endpoints/index.tsx +++ b/packages/apps/src/Endpoints/index.tsx @@ -174,30 +174,23 @@ function Endpoints ({ className = '', offset, onClose }: Props): React.ReactElem [] ); - const _saveApiEndpoint = () => { - try { - localStorage.setItem(CUSTOM_ENDPOINT_KEY, JSON.stringify([...storedCustomEndpoints, apiUrl])); - _onApply(); - } catch (e) { - console.error(e); - // ignore error - } - }; + const _removeApiEndpoint = useCallback( + (): void => { + if (!isSavedCustomEndpoint) return; - const _removeApiEndpoint = () => { - if (!isSavedCustomEndpoint) return; + const newStoredCurstomEndpoints = storedCustomEndpoints.filter((url) => url !== apiUrl); - const newStoredCurstomEndpoints = storedCustomEndpoints.filter((url) => url !== apiUrl); - - try { - localStorage.setItem(CUSTOM_ENDPOINT_KEY, JSON.stringify(newStoredCurstomEndpoints)); - setGroups(combineEndpoints(createWsEndpoints(t))); - setStoredCustomEndpoints(getCustomEndpoints()); - } catch (e) { - console.error(e); - // ignore error - } - }; + try { + localStorage.setItem(CUSTOM_ENDPOINT_KEY, JSON.stringify(newStoredCurstomEndpoints)); + setGroups(combineEndpoints(createWsEndpoints(t))); + setStoredCustomEndpoints(getCustomEndpoints()); + } catch (e) { + console.error(e); + // ignore error + } + }, + [apiUrl, isSavedCustomEndpoint, storedCustomEndpoints, t] + ); const _setApiUrl = useCallback( (network: string, apiUrl: string): void => { @@ -234,6 +227,19 @@ function Endpoints ({ className = '', offset, onClose }: Props): React.ReactElem [apiUrl, onClose] ); + const _saveApiEndpoint = useCallback( + (): void => { + try { + localStorage.setItem(CUSTOM_ENDPOINT_KEY, JSON.stringify([...storedCustomEndpoints, apiUrl])); + _onApply(); + } catch (e) { + console.error(e); + // ignore error + } + }, + [_onApply, apiUrl, storedCustomEndpoints] + ); + const canSwitch = useMemo( () => isSwitchDisabled(hasUrlChanged, apiUrl, isUrlValid), [hasUrlChanged, apiUrl, isUrlValid] @@ -276,17 +282,21 @@ function Endpoints ({ className = '', offset, onClose }: Props): React.ReactElem value={apiUrl} /> {isSavedCustomEndpoint - ?