git.iko.soy/bridge
on master help sign in
Add in web3 directly for MM
eda7e0fWill Galebach
src/views/Login/LoginSelector.tsx+3−9
compare with master
unifiedsplit
@@ -1,5 +1,6 @@
1import React, { useCallback, useState } from 'react';
1import React, { useCallback, useState } from 'react';
2import cn from 'classnames';
2import cn from 'classnames';
3+import Web3 from 'web3';
3import { Grid } from 'indigo-react';
4import { Grid } from 'indigo-react';
4import { Box, Button, Icon, LoadingSpinner, Text } from '@tlon/indigo-react';
5import { Box, Button, Icon, LoadingSpinner, Text } from '@tlon/indigo-react';
5import { useHistory } from 'store/history';
6import { useHistory } from 'store/history';
@@ -7,15 +8,12 @@ import { Just, Nothing } from 'folktale/maybe';
7import { FORM_ERROR } from 'final-form';
8import { FORM_ERROR } from 'final-form';
8
9
9import { useWallet } from 'store/wallet';
10import { useWallet } from 'store/wallet';
10−import { useNetwork } from 'store/network';
11import { usePointCursor } from 'store/pointCursor';
11import { usePointCursor } from 'store/pointCursor';
12
12
13import { WALLET_TYPES } from 'lib/constants';
13import { WALLET_TYPES } from 'lib/constants';
14import { MetamaskWallet } from 'lib/metamask';
14import { MetamaskWallet } from 'lib/metamask';
15import { getAuthToken } from 'lib/authToken';
15import { getAuthToken } from 'lib/authToken';
16−import * as need from 'lib/need';
17import { useWalletConnect } from 'lib/useWalletConnect';
16import { useWalletConnect } from 'lib/useWalletConnect';
18−import useLoginView from 'lib/useLoginView';
19
17
20import Modal from 'components/L2/Modal';
18import Modal from 'components/L2/Modal';
21import HeaderButton from 'components/L2/Headers/HeaderButton';
19import HeaderButton from 'components/L2/Headers/HeaderButton';
@@ -46,8 +44,6 @@ export default function LoginSelector({
46 // Tab props
44 // Tab props
47 ...rest
45 ...rest
48}: LoginSelectorProps) {
46}: LoginSelectorProps) {
49− useLoginView(WALLET_TYPES.WALLET_CONNECT);
50−
51 const { push, names }: any = useHistory();
47 const { push, names }: any = useHistory();
52 const [showModal, setShowModal] = useState(false);
48 const [showModal, setShowModal] = useState(false);
53 const [metamaskSelected, setMetamaskSelected] = useState(false);
49 const [metamaskSelected, setMetamaskSelected] = useState(false);
@@ -62,8 +58,6 @@ export default function LoginSelector({
62 const { connect } = useWalletConnect();
58 const { connect } = useWalletConnect();
63
59
64 const { setPointCursor }: any = usePointCursor();
60 const { setPointCursor }: any = usePointCursor();
65− const { web3 }: any = useNetwork();
66− const _web3 = need.web3(web3);
67
61
68 const goToActivate = useCallback(() => push(names.ACTIVATE), [
62 const goToActivate = useCallback(() => push(names.ACTIVATE), [
69 push,
63 push,
@@ -82,10 +76,11 @@ export default function LoginSelector({
82 );
76 );
83 const wallet = new MetamaskWallet(accounts.result[0]);
77 const wallet = new MetamaskWallet(accounts.result[0]);
84
78
79+ const web3 = new Web3((window as any).ethereum);
85 const authToken = await getAuthToken({
80 const authToken = await getAuthToken({
86 address: wallet.address,
81 address: wallet.address,
87 walletType: WALLET_TYPES.METAMASK,
82 walletType: WALLET_TYPES.METAMASK,
88− web3: _web3,
83+ web3,
89 });
84 });
90
85
91 setAuthToken(Just(authToken));
86 setAuthToken(Just(authToken));
@@ -98,7 +93,6 @@ export default function LoginSelector({
98 return { [FORM_ERROR]: (e as any).message };
93 return { [FORM_ERROR]: (e as any).message };
99 }
94 }
100 }, [
95 }, [
101− _web3,
102 setAuthToken,
96 setAuthToken,
103 setWallet,
97 setWallet,
104 setWalletType,
98 setWalletType,