@@ -1,5 +1,6 @@
11import React, { useCallback, useState } from 'react';
22import cn from 'classnames';
3+import Web3 from 'web3';
34import { Grid } from 'indigo-react';
45import { Box, Button, Icon, LoadingSpinner, Text } from '@tlon/indigo-react';
56import { useHistory } from 'store/history';
@@ -7,15 +8,12 @@ import { Just, Nothing } from 'folktale/maybe';
78import { FORM_ERROR } from 'final-form';
89
910import { useWallet } from 'store/wallet';
10−import { useNetwork } from 'store/network';
1111import { usePointCursor } from 'store/pointCursor';
1212
1313import { WALLET_TYPES } from 'lib/constants';
1414import { MetamaskWallet } from 'lib/metamask';
1515import { getAuthToken } from 'lib/authToken';
16−import * as need from 'lib/need';
1716import { useWalletConnect } from 'lib/useWalletConnect';
18−import useLoginView from 'lib/useLoginView';
1917
2018import Modal from 'components/L2/Modal';
2119import HeaderButton from 'components/L2/Headers/HeaderButton';
@@ -46,8 +44,6 @@ export default function LoginSelector({
4644 // Tab props
4745 ...rest
4846}: LoginSelectorProps) {
49− useLoginView(WALLET_TYPES.WALLET_CONNECT);
50−
5147 const { push, names }: any = useHistory();
5248 const [showModal, setShowModal] = useState(false);
5349 const [metamaskSelected, setMetamaskSelected] = useState(false);
@@ -62,8 +58,6 @@ export default function LoginSelector({
6258 const { connect } = useWalletConnect();
6359
6460 const { setPointCursor }: any = usePointCursor();
65− const { web3 }: any = useNetwork();
66− const _web3 = need.web3(web3);
6761
6862 const goToActivate = useCallback(() => push(names.ACTIVATE), [
6963 push,
@@ -82,10 +76,11 @@ export default function LoginSelector({
8276 );
8377 const wallet = new MetamaskWallet(accounts.result[0]);
8478
79+ const web3 = new Web3((window as any).ethereum);
8580 const authToken = await getAuthToken({
8681 address: wallet.address,
8782 walletType: WALLET_TYPES.METAMASK,
88− web3: _web3,
83+ web3,
8984 });
9085
9186 setAuthToken(Just(authToken));
@@ -98,7 +93,6 @@ export default function LoginSelector({
9893 return { [FORM_ERROR]: (e as any).message };
9994 }
10095 }, [
101− _web3,
10296 setAuthToken,
10397 setWallet,
10498 setWalletType,