diff options
author | Francesco Agosti <francesco.agosti93@gmail.com> | 2018-11-14 09:31:38 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-14 09:31:38 +0800 |
commit | 4fc457b78b30e761164eac26fe5f1ebcddd11f7d (patch) | |
tree | 05a0d01029815d36370f8548d365289f555e8be4 /packages/instant/src/util | |
parent | e02dc13805349a770506350c69e9061f596b48b2 (diff) | |
parent | 2f6b1273aaf621beebcbc70af4bb6c5f4a8217a3 (diff) | |
download | dexon-sol-tools-4fc457b78b30e761164eac26fe5f1ebcddd11f7d.tar dexon-sol-tools-4fc457b78b30e761164eac26fe5f1ebcddd11f7d.tar.gz dexon-sol-tools-4fc457b78b30e761164eac26fe5f1ebcddd11f7d.tar.bz2 dexon-sol-tools-4fc457b78b30e761164eac26fe5f1ebcddd11f7d.tar.lz dexon-sol-tools-4fc457b78b30e761164eac26fe5f1ebcddd11f7d.tar.xz dexon-sol-tools-4fc457b78b30e761164eac26fe5f1ebcddd11f7d.tar.zst dexon-sol-tools-4fc457b78b30e761164eac26fe5f1ebcddd11f7d.zip |
Merge pull request #1242 from 0xProject/feature/instant/metamask-connect-flow
[instant] Install/Unlock MetaMask, connect PaymentDropdown to redux state
Diffstat (limited to 'packages/instant/src/util')
-rw-r--r-- | packages/instant/src/util/asset.ts | 2 | ||||
-rw-r--r-- | packages/instant/src/util/etherscan.ts | 3 | ||||
-rw-r--r-- | packages/instant/src/util/heartbeater_factory.ts | 4 | ||||
-rw-r--r-- | packages/instant/src/util/util.ts | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts index fbfbb19f3..40560d3eb 100644 --- a/packages/instant/src/util/asset.ts +++ b/packages/instant/src/util/asset.ts @@ -80,8 +80,6 @@ export const assetUtils = { return metaData.symbol.toUpperCase(); case AssetProxyId.ERC721: return metaData.name; - default: - return defaultName; } }, formattedSymbolForAsset: (asset?: ERC20Asset, defaultName: string = '???'): string => { diff --git a/packages/instant/src/util/etherscan.ts b/packages/instant/src/util/etherscan.ts index 4d62c4d9f..f9bf82827 100644 --- a/packages/instant/src/util/etherscan.ts +++ b/packages/instant/src/util/etherscan.ts @@ -8,9 +8,8 @@ const etherscanPrefix = (networkId: number): string | undefined => { return 'kovan.'; case Network.Mainnet: return ''; - default: - return undefined; } + return ''; }; export const etherscanUtil = { diff --git a/packages/instant/src/util/heartbeater_factory.ts b/packages/instant/src/util/heartbeater_factory.ts index 96a8ac4e6..06fcdb8bb 100644 --- a/packages/instant/src/util/heartbeater_factory.ts +++ b/packages/instant/src/util/heartbeater_factory.ts @@ -10,13 +10,13 @@ export interface HeartbeatFactoryOptions { export const generateAccountHeartbeater = (options: HeartbeatFactoryOptions): Heartbeater => { const { store, shouldPerformImmediatelyOnStart } = options; return new Heartbeater(async () => { - await asyncData.fetchAccountInfoAndDispatchToStore({ store, shouldSetToLoading: false }); + await asyncData.fetchAccountInfoAndDispatchToStore(store.getState().providerState, store.dispatch, false); }, shouldPerformImmediatelyOnStart); }; export const generateBuyQuoteHeartbeater = (options: HeartbeatFactoryOptions): Heartbeater => { const { store, shouldPerformImmediatelyOnStart } = options; return new Heartbeater(async () => { - await asyncData.fetchCurrentBuyQuoteAndDispatchToStore({ store, shouldSetPending: false }); + await asyncData.fetchCurrentBuyQuoteAndDispatchToStore(store.getState(), store.dispatch, false); }, shouldPerformImmediatelyOnStart); }; diff --git a/packages/instant/src/util/util.ts b/packages/instant/src/util/util.ts index 232a86850..29b6b1d2b 100644 --- a/packages/instant/src/util/util.ts +++ b/packages/instant/src/util/util.ts @@ -2,4 +2,5 @@ import * as _ from 'lodash'; export const util = { boundNoop: _.noop.bind(_), + createOpenUrlInNewWindow: (href: string) => () => window.open(href, '_blank'), }; |