6941c77 · bridge · git.iko.soy

git.iko.soy/bridge

login.js: removing tabs replacing with buttons

commit6941c77bd7e91f59d3a8e118558f079a5e098123 authorJimmy <jyng02@gmail.com> dateMon 9 Mar 2020, 15:50 (7 years ago) parent76ddc37

7 files changed+22−18

compare with master

unifiedsplit

src/lib/routeNames.js+1 src/lib/router.js+2 src/lib/useEthereumTransaction.js+1 src/views/Invite/Cohort.js+1−1 src/views/Invite/Email.js+1−1 src/views/Login.js+15−16 src/views/Login/Other.js+1

src/lib/routeNames.js+1

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

77 INVITES_MANAGE: Symbol('INVITES_MANAGE'),

88 //

99 LOGIN: Symbol('LOGIN'),

10+ LOGIN_OTHER: Symbol('OTHER'),

1011 ADMIN: Symbol('ADMIN'),

1112 REDOWNLOAD: Symbol('REDOWNLOAD'),

1213 RETICKET: Symbol('RETICKET'),

src/lib/router.js+2

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

11import Disclaimer from 'views/Disclaimer';

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

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

34import Admin from 'views/Admin';

45import Senate from 'views/Senate';

56import CreateGalaxy from 'views/CreateGalaxy';

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

2223 [ROUTE_NAMES.DISCLAIMER]: Disclaimer,

2324 [ROUTE_NAMES.ACTIVATE]: Activate,

2425 [ROUTE_NAMES.LOGIN]: Login,

26+ [ROUTE_NAMES.LOGIN_OTHER]: Other,

2527 [ROUTE_NAMES.POINTS]: Points,

2628 [ROUTE_NAMES.POINT]: Point,

2729 [ROUTE_NAMES.CREATE_GALAXY]: CreateGalaxy,

src/lib/useEthereumTransaction.js+1

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

204204 pointCursor,

205205 setError,

206206 signedTransactions,

207+ walletType,

207208 ]);

208209

209210 const reset = useCallback(() => {

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

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

5050 const DetailText = useCallback(

5151 () =>

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

53− [sentInvites]

53+ [pending, sentInvites]

5454 );

5555

5656 return (

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

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

103103 form.reset();

104104 }, 1500);

105105 },

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

106+ [setSubmitting, generateInvites, sendInvites, resetInvites]

107107 );

108108

109109 const validateHasReceived = useCallback(

src/views/Login.js+15−16

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

4545 const { walletType } = useWallet();

4646

4747 // inputs

48− const [currentTab, setCurrentTab] = useState(

49− walletTypeToViewName(walletType)

50− );

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

5149

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

5351 push,

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

6866 </Grid.Item>

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

7068 </Grid.Item>

71−

72− <Grid.Item

73− full

74− as={Tabs}

75− className="mt1"

76− // Tabs

77− views={VIEWS}

78− options={OPTIONS}

79− currentTab={currentTab}

80− onTabChange={setCurrentTab}

81− // Tab extra

82− goHome={goHome}

83− />

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

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

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)}

79+ className="underline gray4">

80+ Back

81+ </Grid.Item>

82+ )}

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

8584 Version {version}

8685 </Grid.Item>

src/views/Login/Other.js+1

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

33import useBreakpoints from 'lib/useBreakpoints';

5+import View from 'components/View';

56import Accordion from 'components/Accordion';

78import PrivateKey from './PrivateKey';