git.iko.soy/bridge
on master help sign in
Merge pull request #220 from urbit/mino-disclaimer-flow

Don't display disclaimer prior to activation code use

commit87a9d7686384266341c38926bee6834cb38b9656 authorFang <Fang-@users.noreply.github.com> dateWed 31 Jul 2019, 20:52 (7 years ago) parentfa92b34b7ece13
3 files changed+16−8
compare with master
unifiedsplit
src/Bridge.js+6−7 src/views/Activate.js+2 src/views/Activate/ActivateCode.js+8−1
src/Bridge.js+6−7
@@ -48,13 +48,12 @@ function useInitialRoutes() {
4848 ];
4949 }
5050
51− const landingPage = hasImpliedTicket
52− ? ROUTE_NAMES.ACTIVATE
53− : ROUTE_NAMES.LOGIN;
54−
55− const extraRoutes = !hasDisclaimed ? [{ key: ROUTE_NAMES.DISCLAIMER }] : [];
56−
57− return [{ key: landingPage }, ...extraRoutes];
51+ return hasImpliedTicket
52+ ? [{ key: ROUTE_NAMES.ACTIVATE }]
53+ : [
54+ { key: ROUTE_NAMES.LOGIN },
55+ ...(!hasDisclaimed ? [{ key: ROUTE_NAMES.DISCLAIMER }] : []),
56+ ];
5857}
5958
6059function Bridge() {
src/views/Activate.js+2
@@ -7,6 +7,7 @@ import useActivateFlowState from './Activate/useActivateFlowState';
77import ActivateCode from './Activate/ActivateCode';
88import { LocalRouterProvider } from 'lib/LocalRouter';
99import ActivatePassport from './Activate/ActivatePassport';
10+import Disclaimer from './Disclaimer';
1011
1112const NAMES = {
1213 CODE: 'CODE',
@@ -17,6 +18,7 @@ const NAMES = {
1718const VIEWS = {
1819 [NAMES.CODE]: ActivateCode,
1920 [NAMES.PASSPORT]: ActivatePassport,
21+ [NAMES.DISCLAIMER]: Disclaimer,
2022};
2123
2224export default function Activate() {
src/views/Activate/ActivateCode.js+8−1
@@ -22,12 +22,14 @@ import { generateTemporaryOwnershipWallet } from 'lib/walletgen';
2222import { useActivateFlow } from './ActivateFlow';
2323import { useLocalRouter } from 'lib/LocalRouter';
2424import useImpliedTicket from 'lib/useImpliedTicket';
25+import useHasDisclaimed from 'lib/useHasDisclaimed';
2526
2627export default function ActivateCode() {
2728 const history = useHistory();
2829 const { names, push } = useLocalRouter();
2930 const { contracts } = useNetwork();
3031 const impliedTicket = useImpliedTicket();
32+ const [hasDisclaimed] = useHasDisclaimed();
3133 const [generalError, setGeneralError] = useState();
3234 const [deriving, setDeriving] = useState(false);
3335 const {
@@ -48,7 +50,12 @@ export default function ActivateCode() {
4850 const goToLogin = useCallback(() => history.popAndPush(ROUTE_NAMES.LOGIN), [
4951 history,
5052 ]);
51− const goToPassport = useCallback(() => push(names.PASSPORT), [names, push]);
53+ const goToPassport = useCallback(() => {
54+ push(names.PASSPORT);
55+ if (!hasDisclaimed) {
56+ push(names.DISCLAIMER);
57+ }
58+ }, [names, push, hasDisclaimed]);
5259
5360 const pass = derivedWallet.matchWith({
5461 Nothing: () => false,