git.iko.soy/bridge
on master help sign in
Handle incomplete initial code
commit443a40085d7b064e0212bce2aa31ff76afb6ad15 authorWill Galebach <willbach@gmail.com> dateWed 29 Dec 2021, 15:05 (5 years ago) parentec7d513
2 files changed+21−8
compare with master
unifiedsplit
src/views/Activate/ActivateCode.tsx+8−3 src/views/Activate/ActivateCodeForm.tsx+13−5
src/views/Activate/ActivateCode.tsx+8−3
@@ -1,4 +1,4 @@
1−import { useCallback } from 'react';
1+import { useCallback, useMemo } from 'react';
22
33import View from 'components/View';
44import ActivateView from './ActivateView';
@@ -30,14 +30,19 @@ export default function ActivateCode() {
3030 // Fade in on load
3131 useFadeIn();
3232
33+ const hasInitialValues = useMemo(() => impliedTicket && impliedPatp, [
34+ impliedTicket,
35+ impliedPatp,
36+ ]);
37+
3338 return (
3439 <View inset>
3540 <ActivateView
36− hideBack={Boolean(impliedTicket)}
41+ hideBack={hasInitialValues}
3742 header={<ActivateHeader content={'Planet Code'} />}
3843 footer={<ActivateCodeForm afterSubmit={goToMasterKey} />}>
3944 <Box className="flex-col align-center justify-center w-full h-full">
40− {!impliedTicket && (
45+ {!hasInitialValues && (
4146 <Box className="mb2 sans gray5" fontSize={14}>
4247 Enter your planet code below
4348 </Box>
src/views/Activate/ActivateCodeForm.tsx+13−5
@@ -80,6 +80,11 @@ const ActivateCodeForm = ({ afterSubmit }: ActivateCodeFormProps) => {
8080 [validateForm]
8181 );
8282
83+ const hasInitialValues = useMemo(() => impliedTicket && impliedPatp, [
84+ impliedTicket,
85+ impliedPatp,
86+ ]);
87+
8388 const getTicketAndPoint = useCallback(
8489 (invite: string) => {
8590 const segments = invite.split('-');
@@ -174,12 +179,15 @@ const ActivateCodeForm = ({ afterSubmit }: ActivateCodeFormProps) => {
174179 );
175180
176181 const initialValues = useMemo(
177− () => ({ ticket: impliedTicket || '', showTicket: true }),
178− [impliedTicket]
182+ () => ({
183+ ticket: hasInitialValues
184+ ? `${impliedTicket}-${impliedPatp?.slice(1)}`
185+ : '',
186+ showTicket: true,
187+ }),
188+ [impliedTicket, impliedPatp, hasInitialValues]
179189 );
180190
181− const hasInitialValues = impliedTicket && impliedPatp;
182−
183191 return (
184192 <Box
185193 className="w-full h-full flex-col"
@@ -192,7 +200,7 @@ const ActivateCodeForm = ({ afterSubmit }: ActivateCodeFormProps) => {
192200 initialValues={initialValues}>
193201 {({ valid, validating, values, submitting, handleSubmit }) => (
194202 <>
195− {!impliedTicket && (
203+ {!hasInitialValues && (
196204 <Grid.Item
197205 full
198206 className="mb2"