bd7ed64 · bridge · git.iko.soy

src/components/InlineEthereumTransaction.js−2

compare with master

unifiedsplit

@@ -12,7 +12,6 @@ import BridgeForm from 'form/BridgeForm';

12import { GenerateButton, ForwardButton, RestartButton } from './Buttons';

13import ProgressButton from './ProgressButton';

14import NeedFundsNotice from './NeedFundsNotice';

15−import NoticeBox from './NoticeBox';

16

15

17import './InlineEthereumTransaction.scss';

16import './InlineEthereumTransaction.scss';

18import FeeDropdown from './L2/Dropdowns/FeeDropdown';

17import FeeDropdown from './L2/Dropdowns/FeeDropdown';

@@ -58,7 +57,6 @@ export default function InlineEthereumTransaction({

58 const showLoadingButton = broadcasted || confirmed;

57 const showLoadingButton = broadcasted || confirmed;

59 const canBroadcast = signed && !needFunds;

58 const canBroadcast = signed && !needFunds;

60 // show signed tx only when signing (for offline usage)

59 // show signed tx only when signing (for offline usage)

61− const showSignedTx = signed;

62

60

63 const validate = useMemo(

61 const validate = useMemo(

64 () =>

62 () =>

src/components/L2/Dropdowns/FeeDropdown.tsx+1−1

@@ -96,4 +96,4 @@ export default function FeeDropdown({

96 </Box>

97 </Dropdown>

98 );

99−};

99+}

src/components/NetworkingKeys.js+1−1

@@ -1,5 +1,5 @@

1import React from 'react';

2−import { Grid, Flex, H5, Text } from 'indigo-react';

2+import { Grid, Flex, H5 } from 'indigo-react';

3import { Just, Nothing } from 'folktale/maybe';

4

5import { formatDotsWithTime } from 'lib/dateFormat';

src/lib/useRoller.ts+8−4

@@ -123,10 +123,14 @@ export default function useRoller() {

123 });

124 }, [api]); // eslint-disable-line react-hooks/exhaustive-deps

125

126+ const ls = useMemo(

127+ () =>

126− const ls = new SecureLS({

128+ new SecureLS({

127− isCompression: false,

129+ isCompression: false,

128− encryptionSecret: authToken.getOrElse('default'),

130+ encryptionSecret: authToken.getOrElse('default'),

129− });

131+ }),

132+ [authToken]

133+ );

130

134

131 const generateInviteCodes = useCallback(

135 const generateInviteCodes = useCallback(

132 async (numInvites: number) => {

136 async (numInvites: number) => {

src/store/network.js−1

@@ -84,7 +84,6 @@ function _useNetwork(initialNetworkType = null) {

84 }

85 case NETWORK_TYPES.ROPSTEN: {

86 const endpoint = `https://ropsten.infura.io/v3/${process.env.REACT_APP_INFURA_ENDPOINT}`;

87− console.log('ENDPOINT', endpoint)

88

87

89 initWeb3(

88 initWeb3(

90 new Web3.providers.HttpProvider(endpoint),

89 new Web3.providers.HttpProvider(endpoint),

src/views/Invite/Cohort.tsx−1

@@ -1,7 +1,6 @@

1import React, { useEffect, useCallback, useState } from 'react';

2import { Grid, Button } from 'indigo-react';

3import * as azimuth from 'azimuth-js';

4−import { Just } from 'folktale/maybe';

5import {

4import {

6 Icon,

5 Icon,

7 Row,

6 Row,

src/views/Login.tsx+1−4

@@ -1,4 +1,4 @@

1−import React, { useCallback, useState } from 'react';

1+import React, { useCallback } from 'react';

2import { Grid, Text, Flex } from 'indigo-react';

3

4import { versionLabel } from 'lib/flags';

@@ -17,9 +17,6 @@ export default function Login() {

17 const { push, names }: any = useHistory();

18 const flow: any = useFlowCommand();

19

20− // inputs

21− const [isOther, setisOther] = useState(false);

22−

23 const goHome = useCallback(() => {

20 const goHome = useCallback(() => {

24 if (!flow) {

21 if (!flow) {

25 push(names.POINTS);

22 push(names.POINTS);

src/views/Login/WalletConnect.tsx+1−4

@@ -55,10 +55,7 @@ const WalletConnectLogin = ({ className, goHome }) => {

55 <LegacyText as="div">

56 {address ? abbreviateAddress(address) : null}

57 </LegacyText>

58− <RestartButton

59− as="a"

60− className={'gray3'}

61− onClick={disconnect}>

58+ <RestartButton as="a" className={'gray3'} onClick={disconnect}>

62 disconnect

59 disconnect

63 </RestartButton>

60 </RestartButton>

64 </Grid.Item>

61 </Grid.Item>

src/views/UrbitID/ResetKeys.js+1−1

@@ -1,6 +1,6 @@

1import React, { useCallback, useState } from 'react';

2import { Just, Nothing } from 'folktale/maybe';

3−import { Grid, Flex } from 'indigo-react';

3+import { Flex } from 'indigo-react';

4

5import { LocalRouterProvider } from 'lib/LocalRouter';

6import useRouter from 'lib/useRouter';