aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/utils
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-03-15 05:36:04 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-03-15 05:36:04 +0800
commit380e51ca505a880e1ac24f46b3ba7e1a736f693e (patch)
tree95e0311485834d8181171da821f258dd46a2d258 /packages/website/ts/utils
parent6a8c2cb7172be9b0aadb34904d1d9b3348bed0cc (diff)
parentaea7207b9f9865a279243889a5f9ca1638ddc739 (diff)
downloaddexon-0x-contracts-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar
dexon-0x-contracts-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.gz
dexon-0x-contracts-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.bz2
dexon-0x-contracts-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.lz
dexon-0x-contracts-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.xz
dexon-0x-contracts-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.zst
dexon-0x-contracts-380e51ca505a880e1ac24f46b3ba7e1a736f693e.zip
Merge branch 'development' into feature/utils/console-log
* development: (25 commits) Enable coverage for all other packages with tests Fix parallel coverage results reporting Fix linter issuesx Remove outdated comment Add script copying to build command Add postpublish script to sol-cov Move configuration into package.json configs section Transform input data before encoding for callAsync and getABIEncodedTransactionData Consolidate docs generation and uploading logic Use async/await instead of promise syntax Move changelog entry remove unneeded include remove unused dep Fix lint issues Re-add linter to monorepo-scripts but with tslint-config dep at earlier version to avoid cyclical dependency small fixes move scripts to monorepro-scripts Fix gitignore Move abi-gen scripts to src Add missing dep ...
Diffstat (limited to 'packages/website/ts/utils')
-rw-r--r--packages/website/ts/utils/utils.ts6
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index d2ec3e886..25d7e449b 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -276,10 +276,6 @@ export const utils = {
const constructorName = provider.constructor.name;
let parsedProviderName = constructorName;
switch (constructorName) {
- case 'MetamaskInpageProvider':
- parsedProviderName = Providers.Metamask;
- break;
-
case 'EthereumProvider':
parsedProviderName = Providers.Mist;
break;
@@ -290,6 +286,8 @@ export const utils = {
}
if ((provider as any).isParity) {
parsedProviderName = Providers.Parity;
+ } else if ((provider as any).isMetaMask) {
+ parsedProviderName = Providers.Metamask;
}
return parsedProviderName;
},