6941c77 · bridge · git.iko.soy

src/lib/routeNames.js+1

compare with master

unifiedsplit

@@ -7,6 +7,7 @@ export const ROUTE_NAMES = {

7 INVITES_MANAGE: Symbol('INVITES_MANAGE'),

8 //

9 LOGIN: Symbol('LOGIN'),

10+ LOGIN_OTHER: Symbol('OTHER'),

10 ADMIN: Symbol('ADMIN'),

11 ADMIN: Symbol('ADMIN'),

11 REDOWNLOAD: Symbol('REDOWNLOAD'),

12 REDOWNLOAD: Symbol('REDOWNLOAD'),

12 RETICKET: Symbol('RETICKET'),

13 RETICKET: Symbol('RETICKET'),

src/lib/router.js+2

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

1import Disclaimer from 'views/Disclaimer';

2import Login from 'views/Login.js';

3+import Other from 'views/Login/Other.js';

3import Admin from 'views/Admin';

4import Admin from 'views/Admin';

4import Senate from 'views/Senate';

5import Senate from 'views/Senate';

5import CreateGalaxy from 'views/CreateGalaxy';

6import CreateGalaxy from 'views/CreateGalaxy';

@@ -22,6 +23,7 @@ export const ROUTES = {

22 [ROUTE_NAMES.DISCLAIMER]: Disclaimer,

23 [ROUTE_NAMES.DISCLAIMER]: Disclaimer,

23 [ROUTE_NAMES.ACTIVATE]: Activate,

24 [ROUTE_NAMES.ACTIVATE]: Activate,

24 [ROUTE_NAMES.LOGIN]: Login,

25 [ROUTE_NAMES.LOGIN]: Login,

26+ [ROUTE_NAMES.LOGIN_OTHER]: Other,

25 [ROUTE_NAMES.POINTS]: Points,

27 [ROUTE_NAMES.POINTS]: Points,

26 [ROUTE_NAMES.POINT]: Point,

28 [ROUTE_NAMES.POINT]: Point,

27 [ROUTE_NAMES.CREATE_GALAXY]: CreateGalaxy,

29 [ROUTE_NAMES.CREATE_GALAXY]: CreateGalaxy,

src/lib/useEthereumTransaction.js+1

@@ -204,6 +204,7 @@ export default function useEthereumTransaction(

204 pointCursor,

205 setError,

206 signedTransactions,

207+ walletType,

207 ]);

208 ]);

208

209

209 const reset = useCallback(() => {

210 const reset = useCallback(() => {

src/views/Invite/Cohort.js+1−1

@@ -50,7 +50,7 @@ function CohortMember({ point, pending = false, className }) {

50 const DetailText = useCallback(

51 () =>

52 pending ? 'Pending' : <> {matchBlinky(sentInvites)} points invited </>,

53− [sentInvites]

53+ [pending, sentInvites]

54 );

55

56 return (

src/views/Invite/Email.js+1−1

@@ -103,7 +103,7 @@ const InviteMail = ({ setSubmitting }) => {

103 form.reset();

104 }, 1500);

105 },

106− [generateInvites, setCount, setStatus, sendInvites, setSubmitting]

106+ [setSubmitting, generateInvites, sendInvites, resetInvites]

107 );

108

109 const validateHasReceived = useCallback(

src/views/Login.js+15−16

@@ -45,9 +45,7 @@ export default function Login() {

45 const { walletType } = useWallet();

46

47 // inputs

48− const [currentTab, setCurrentTab] = useState(

48+ const [isOther, setisOther] = useState(false);

49− walletTypeToViewName(walletType)

50− );

51

49

52 const goToActivate = useCallback(() => push(names.ACTIVATE), [

50 const goToActivate = useCallback(() => push(names.ACTIVATE), [

53 push,

51 push,

@@ -68,19 +66,20 @@ export default function Login() {

68 </Grid.Item>

66 </Grid.Item>

69 <Grid.Item as={Text}>Login</Grid.Item>

67 <Grid.Item as={Text}>Login</Grid.Item>

70 </Grid.Item>

68 </Grid.Item>

71−

72− <Grid.Item

69+ {isOther && <Grid.Item full as={Other} />}

73− full

70+ {!isOther && <Grid.Item full as={Ticket} />}

74− as={Tabs}

71+ {!isOther && (

72+ <Grid.Item full as={ForwardButton} onClick={() => setisOther(true)}>

73+ Metamask ledger, etc.

74+ </Grid.Item>

75+ )}

76+ {isOther && (

77+ <Grid.Item

78+ onClick={() => setisOther(false)}

75− className="mt1"

79+ className="underline gray4">

76− // Tabs

80+ Back

77− views={VIEWS}

81+ </Grid.Item>

78− options={OPTIONS}

82+ )}

79− currentTab={currentTab}

80− onTabChange={setCurrentTab}

81− // Tab extra

82− goHome={goHome}

83− />

84 <Grid.Item full as={P} className="f6">

83 <Grid.Item full as={P} className="f6">

85 Version {version}

84 Version {version}

86 </Grid.Item>

85 </Grid.Item>

src/views/Login/Other.js+1

@@ -2,6 +2,7 @@ import React, { useState, useMemo } from 'react';

2

3import useBreakpoints from 'lib/useBreakpoints';

4

5+import View from 'components/View';

5import Accordion from 'components/Accordion';

6import Accordion from 'components/Accordion';

6

7

7import PrivateKey from './PrivateKey';

8import PrivateKey from './PrivateKey';