From c009e9979e8590701d10fbe5f623c6e618e86fc6 Mon Sep 17 00:00:00 2001 From: Tom Schmidt Date: Thu, 8 Mar 2018 16:06:44 -0800 Subject: Added web3 provider logging --- packages/website/ts/index.tsx | 6 ++++++ packages/website/ts/utils/utils.ts | 26 +++++++++----------------- 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index c0539c6d0..f3ec00e35 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -18,6 +18,8 @@ import { tradeHistoryStorage } from 'ts/local_storage/trade_history_storage'; import { reducer, State } from 'ts/redux/reducer'; import { WebsitePaths } from 'ts/types'; import { muiTheme } from 'ts/utils/mui_theme'; +import { utils } from 'ts/utils/utils'; +import * as Web3 from 'web3'; import 'whatwg-fetch'; injectTapEventPlugin(); @@ -46,6 +48,10 @@ const LazyConnectDocumentation = createLazyComponent('Documentation', async () = ); ReactGA.initialize('UA-98720122-1'); +window.onload = () => { + const providerName = (window as any).web3 ? utils.web3ProviderToString((window as any).web3.currentProvider) : 'NONE'; + ReactGA.ga('set', 'dimension1', providerName); +}; const store: ReduxStore = createStore(reducer); render( diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 3d24cb1f4..bed818351 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -1,4 +1,4 @@ -import { ECSignature, ExchangeContractErrs, ZeroEx, ZeroExError } from '0x.js'; +import { ECSignature, ExchangeContractErrs, ZeroEx, ZeroExError, Web3Provider } from '0x.js'; import { BigNumber } from '@0xproject/utils'; import deepEqual = require('deep-equal'); import isMobile = require('is-mobile'); @@ -309,22 +309,14 @@ export const utils = { containerId, }); }, - web3ProviderNameToString(web3ProviderName: string): string { - let parsedProviderName = "UNKNOWN"; - if(web3ProviderName === "MetamaskInpageProvider") { - parsedProviderName = "METAMASK"; - } - else if(web3ProviderName === "EthereumProvider") { - parsedProviderName = "MIST"; - } - else if(web3ProviderName === "o") { - parsedProviderName = "PARITY"; - } - else if(web3ProviderName.indexOf("infura") !== -1) { - parsedProviderName = "INFURA"; - } - else if(web3ProviderName.indexOf("localhost") !== -1) { - parsedProviderName ="LOCALHOST"; + web3ProviderToString(provider: Web3Provider): string { + let parsedProviderName = provider.constructor.name; + if (provider.constructor.name === 'MetamaskInpageProvider') { + parsedProviderName = 'METAMASK'; + } else if (provider.constructor.name === 'EthereumProvider') { + parsedProviderName = 'MIST'; + } else if (provider.constructor.name === 'o') { + parsedProviderName = 'PARITY'; } return parsedProviderName; }, -- cgit v1.2.3