From 2cb504747afab294a2baa791274eb6375a0354b5 Mon Sep 17 00:00:00 2001 From: Keith Date: Thu, 14 Nov 2019 16:44:01 +0800 Subject: [PATCH 1/2] feat(neuron-ui): update chain types on launch --- packages/neuron-wallet/src/services/networks.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/neuron-wallet/src/services/networks.ts b/packages/neuron-wallet/src/services/networks.ts index fc4d4188f7..45a82e58bc 100644 --- a/packages/neuron-wallet/src/services/networks.ts +++ b/packages/neuron-wallet/src/services/networks.ts @@ -10,6 +10,7 @@ import { Validate, Required } from 'decorators' import { UsedName, NetworkNotFound, InvalidFormat } from 'exceptions' import { NetworkListSubject, CurrentNetworkIDSubject } from 'models/subjects/networks' import { NetworkID, NetworkName, NetworkRemote, NetworksKey, NetworkType, Network, NetworkWithID } from 'types/network' +import logger from 'utils/logger' export const networkSwitchSubject = new BehaviorSubject(undefined) @@ -31,6 +32,21 @@ export default class NetworksService extends Store { NetworkListSubject.next({ currentNetworkList, }) + Promise.all(currentNetworkList.map(n => { + const core = new Core(n.remote) + return core.rpc + .getBlockchainInfo() + .then(info => info.chain) + .catch(() => '') + .then(chain => ({ + ...n, + chain, + })) + })).then(networkList => { + this.updateAll(networkList) + }).catch((err: Error) => { + logger.error(err) + }) } }) From e4fc0d34b39611575d909747df2f5be06ceb9a9f Mon Sep 17 00:00:00 2001 From: Keith Date: Thu, 14 Nov 2019 17:35:14 +0800 Subject: [PATCH 2/2] refactor(neuron-wallet): remove default chain type because they are updated on launch --- packages/neuron-wallet/src/env.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neuron-wallet/src/env.ts b/packages/neuron-wallet/src/env.ts index 945b731de3..f4a3e0ba2f 100644 --- a/packages/neuron-wallet/src/env.ts +++ b/packages/neuron-wallet/src/env.ts @@ -54,14 +54,14 @@ const env: ENV = { name: 'Testnet', remote: 'http://localhost:8114', type: 0, - chain: 'ckb_testnet', + chain: '', }, { id: 'local', name: 'Local', remote: 'http://localhost:8114', type: 1, - chain: 'ckb_dev', + chain: '', }, ], },