Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:blank page appears in validate code form page #55588

Merged
merged 69 commits into from
Mar 3, 2025
Merged
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
6373c37
fix:blank page appears in validate code form page
jacobkim9881 Jan 22, 2025
172c7b0
lint: fixed ! assertion error
jacobkim9881 Jan 22, 2025
c4e944f
pulled original/main
jacobkim9881 Jan 22, 2025
6232476
lint assertion err fixed
jacobkim9881 Jan 23, 2025
d216e60
lint disabled prop spreading
jacobkim9881 Jan 23, 2025
217ac60
Revert "pulled original/main"
jacobkim9881 Jan 23, 2025
622df4f
comment type for ref
jacobkim9881 Jan 23, 2025
9f1f207
should resolve() if container is undefined
jacobkim9881 Jan 23, 2025
5493c6b
comment about focus trap for animation
jacobkim9881 Jan 23, 2025
dd436e9
fix: clicking header back err occurs
jacobkim9881 Jan 23, 2025
a404826
clear error only after closing the modal
jacobkim9881 Jan 24, 2025
6640264
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Jan 24, 2025
6a12518
lint fixed
jacobkim9881 Jan 24, 2025
3f12bb5
Revert "lint fixed"
jacobkim9881 Jan 24, 2025
433778f
lint fixed
jacobkim9881 Jan 24, 2025
c001758
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Jan 28, 2025
72e88b7
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Jan 29, 2025
0afd14a
moved isVisible in the validate code form
jacobkim9881 Jan 30, 2025
9b7b20d
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Jan 30, 2025
c19c2af
hide menu items while sliding out of validate page
jacobkim9881 Jan 31, 2025
0c12b86
Revert "hide menu items while sliding out of validate page"
jacobkim9881 Jan 31, 2025
b6e0138
fix: trashcan shows as navigating out on mWeb
jacobkim9881 Feb 2, 2025
5cce05c
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 2, 2025
426d8be
delete this becuase transition anim works w/o it
jacobkim9881 Feb 3, 2025
00d7c51
renamed and deleted ValidateCodeActionWithoutModal
jacobkim9881 Feb 3, 2025
8d37911
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 3, 2025
23498e9
lint fixed
jacobkim9881 Feb 3, 2025
0d1f9fe
focusTrap not needed in mSafari
jacobkim9881 Feb 3, 2025
a317155
fix: keyboard not show on Android app, iOS app
jacobkim9881 Feb 4, 2025
5b3af3c
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 4, 2025
e37d564
fix: show remove contact method modal
jacobkim9881 Feb 4, 2025
589f444
focusTrap not needed in mSafari
jacobkim9881 Feb 4, 2025
0e4b20f
show/hide code form
jacobkim9881 Feb 5, 2025
bc83a7b
fix: clear error runs on default contact method too
jacobkim9881 Feb 6, 2025
1c0cced
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 7, 2025
91e940d
fix: has 2 isVisible
jacobkim9881 Feb 7, 2025
943ce63
not use setState for isValidated
jacobkim9881 Feb 7, 2025
a2c3878
created type for ValidateCodeActionForm
jacobkim9881 Feb 7, 2025
600d0d5
check isValidated not needed for sendValidateCode
jacobkim9881 Feb 7, 2025
3fc7ee4
commeted for cleanup function
jacobkim9881 Feb 7, 2025
c715494
not use firstRenderRef
jacobkim9881 Feb 11, 2025
ef17df1
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 11, 2025
9b73217
showing button on number pad poped up on iOS mWeb
jacobkim9881 Feb 11, 2025
08b8d76
fix: keyboard not show on Android app, iOS app
jacobkim9881 Feb 12, 2025
aac99d3
deleted unneeded condition
jacobkim9881 Feb 12, 2025
bc398e4
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 12, 2025
3a7ebdf
Merge branch 'd53884-5' of github.com:jacobkim9881/Expensify-App into…
jacobkim9881 Feb 12, 2025
35ab2c8
lint
jacobkim9881 Feb 12, 2025
f415985
runs clearError() as call back when unmounted
jacobkim9881 Feb 12, 2025
09e4bc1
fix: when clicking contact method 2nd time, numpad not showing on And…
jacobkim9881 Feb 14, 2025
acdfb6e
control useFocusEffect for BaseValidateCodeForm
jacobkim9881 Feb 15, 2025
46fc5ae
control useFocusEffect for BaseValidateCodeForm
jacobkim9881 Feb 16, 2025
c563704
Revert "control useFocusEffect for BaseValidateCodeForm"
jacobkim9881 Feb 17, 2025
44074dd
Revert "control useFocusEffect for BaseValidateCodeForm"
jacobkim9881 Feb 17, 2025
56778e3
Revert "fix: when clicking contact method 2nd time, numpad not showin…
jacobkim9881 Feb 17, 2025
d0f1782
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 17, 2025
043e4df
fix: when clicking contact method 2nd time, numpad not showing on An…
jacobkim9881 Feb 17, 2025
0eb5dd7
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 18, 2025
caef7cd
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 20, 2025
7bfcb5d
merged #57042: fix: Error text overlap on the magic code input screen…
jacobkim9881 Feb 20, 2025
962def0
Revert " fix: when clicking contact method 2nd time, numpad not showi…
jacobkim9881 Feb 21, 2025
521653b
Revert "merged #57042: fix: Error text overlap on the magic code inpu…
jacobkim9881 Feb 21, 2025
5dec1b7
merged #57042: fix: Error text overlap on the magic code input screen…
jacobkim9881 Feb 21, 2025
c9e11ad
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 22, 2025
04a1970
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 25, 2025
6833658
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 26, 2025
e9d0ca3
trapContainer has to exist in the second half of this
jacobkim9881 Feb 27, 2025
c9f9ef1
loginData should exist before loginData.validatedDate
jacobkim9881 Feb 27, 2025
5a33b5a
Merge branch 'main' of https://github.com/Expensify/App into m53884
jacobkim9881 Feb 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
hide menu items while sliding out of validate page
jacobkim9881 committed Jan 31, 2025
commit c19c2af3646224f8e32fa0caee229ab2f81fb5ef
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
const {windowWidth} = useWindowDimensions();

const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [isValidateCodeFormRendered, setIsValidateCodeFormRendered] = useState(false);
const validateCodeFormRef = useRef<ValidateCodeFormHandle>(null);
const backTo = route.params.backTo;

@@ -165,8 +166,11 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
useBeforeRemove(() => setIsValidateCodeActionModalVisible(false));

useEffect(() => {
if (!isValidateCodeFormRendered && !loginData?.validatedDate) {
setIsValidateCodeFormRendered(true);
}
setIsValidateCodeActionModalVisible(!loginData?.validatedDate);
}, [loginData?.validatedDate, loginData?.errorFields?.addedLogin]);
}, [loginData?.validatedDate, loginData?.errorFields?.addedLogin, isValidateCodeFormRendered]);

useEffect(() => {
resetContactMethodValidateCodeSentState(contactMethod);
@@ -332,7 +336,7 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
forwardedRef={validateCodeFormRef}
/>

{!isValidateCodeActionModalVisible && getMenuItems()}
{!isValidateCodeActionModalVisible && !isValidateCodeFormRendered && getMenuItems()}
</ScrollView>
</ScreenWrapper>
);