Merge branch 'development' into feature/cla-assistant

src/components/ConnectButton/index.tsx

@@ -56,7 +56,7 @@ export const onboard = Onboard({
   ],
 })
 
-export const onboardUser = async () => {
+export const onboardUser = async (): Promise<boolean> => {
   // before calling walletSelect you want to check if web3 has been instantiated
   // which indicates that a wallet has already been selected
   // and web3 has been instantiated with that provider
@@ -65,7 +65,7 @@ export const onboardUser = async () => {
   return walletSelected && onboard.walletCheck()
 }
 
-const ConnectButton = (props) => (
+const ConnectButton = (props): React.ReactElement => (
   <Button
     color="primary"
     minWidth={140}

src/logic/wallets/getWeb3.ts

@@ -95,14 +95,10 @@ const isSmartContractWallet = async (web3Provider: Web3, account: string): Promi
   return contractCode.replace(EMPTY_DATA, '').replace(/0/g, '') !== ''
 }
 
-export const getProviderInfo = async (
+export const getProviderInfo = async (web3Instance: Web3, providerName = 'Wallet'): Promise<ProviderProps> => {
-  web3Provider: string | Provider,
+  const account = await getAccountFrom(web3Instance)
-  providerName = 'Wallet',
+  const network = await getNetworkIdFrom(web3Instance)
-): Promise<ProviderProps> => {
+  const smartContractWallet = await isSmartContractWallet(web3Instance, account)
-  web3 = new Web3(web3Provider)
-  const account = await getAccountFrom(web3)
-  const network = await getNetworkIdFrom(web3)
-  const smartContractWallet = await isSmartContractWallet(web3, account)
   const hardwareWallet = isHardwareWallet(providerName)
 
   const available = account !== null

src/logic/wallets/store/actions/fetchProvider.ts

@@ -51,7 +51,7 @@ const handleProviderNotification = (provider, dispatch) => {
 
 export default (providerName: string) => async (dispatch: Dispatch): Promise<void> => {
   const web3 = getWeb3()
-  const providerInfo = await getProviderInfo(web3.currentProvider, providerName)
+  const providerInfo = await getProviderInfo(web3, providerName)
   await handleProviderNotification(providerInfo, dispatch)
   processProviderResponse(dispatch, providerInfo)
 }

src/logic/wallets/store/middlewares/providerWatcher.ts

@@ -37,7 +37,7 @@ const providerWatcherMware = (store) => (next) => async (action) => {
 
         watcherInterval = setInterval(async () => {
           const web3 = getWeb3()
-          const providerInfo = await getProviderInfo(web3.currentProvider)
+          const providerInfo = await getProviderInfo(web3)
 
           const networkChanged = currentProviderProps.network !== providerInfo.network
 

src/test/builder/safe.redux.builder.ts

@@ -72,7 +72,8 @@ export const aMinedSafe = async (
   threshold = 1,
   name = 'Safe Name',
 ) => {
-  const provider = await getProviderInfo(window.web3?.currentProvider || 'ws://localhost:8545')
+  const web3 = getWeb3()
+  const provider = await getProviderInfo(web3)
   const walletRecord = makeProvider(provider)
   store.dispatch(addProvider(walletRecord))
 

src/test/safe.dom.create.tsx

@@ -31,7 +31,8 @@ afterAll(() => {
 })
 
 const renderOpenSafeForm = async (localStore) => {
-  const provider = await getProviderInfo(window.web3.currentProvider)
+  const web3 = getWeb3()
+  const provider = await getProviderInfo(web3)
   const walletRecord = makeProvider(provider)
   localStore.dispatch(addProvider(walletRecord))
 

src/test/safe.dom.load.tsx

@@ -29,7 +29,8 @@ afterAll(() => {
 })
 
 const renderLoadSafe = async (localStore) => {
-  const provider = await getProviderInfo(window.web3.currentProvider || 'ws://localhost:8545')
+  const web3 = getWeb3()
+  const provider = await getProviderInfo(web3)
   const walletRecord = makeProvider(provider)
   localStore.dispatch(addProvider(walletRecord))
 

yarn.lock

@@ -2327,6 +2327,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.28.tgz#0e36d718a29355ee51cec83b42d921299200f6d9"
   integrity sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==
 
+"@types/node@^10.12.18":
+  version "10.17.28"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.28.tgz#0e36d718a29355ee51cec83b42d921299200f6d9"
+  integrity sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==
+
 "@types/node@^10.3.2":
   version "10.17.27"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.27.tgz#391cb391c75646c8ad2a7b6ed3bbcee52d1bdf19"