Fix the issue with the padding above keyboard in the SignInModal along with derivatives #69267

OlGierd03 · 2025-08-26T15:11:33Z

Explanation of Change

In the SignInModal on the Android app, when the keyboard appears, the view shifts and the footer extends, blocking part of the view. This issue has been addressed by removing the double use of ScreenWrapper for the SignInModal on every platform except iOS Safari, where the use of the outer ScreenWrapper with the shouldEnableMaxHeight prop serves as a workaround for Safari not supporting interactive-widget=resizes-content (the second use of ScreenWrapper was previously added for this reason).

Removing the double use of ScreenWrapper also fixes #67863.

The changes in this PR are the same as those in software-mansion-labs#243. This PR was created due to the merge of the parent branch, which modified SignInPage and thus created the possibility to change the base repository.

Fixed Issues

$ #69068
$ #67863

Tests

Make sure to be logged out of your account.
Open public room page via deep link (e.g. https://staging.new.expensify.com/r/5583419180793784).
Click the footer Sign in button.
Click on the input window to display the keyboard and verify that the footer hasn't expanded, blocking much of the view. Additionally, scroll down to the bottom of the modal and check that no additional padding is displayed after opening the language dropdown (issue occurred on iOS app).

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Recording_20250820_164004.2.mp4

Android: mWeb Chrome

Screen.Recording.2025-08-20.at.16.04.50.mp4

iOS: Native

ScreenRecording_08-26-2025.15-48-16_1.mp4

iOS: mWeb Safari

Screen.Recording.2025-08-20.at.16.00.41.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-08-20.at.15.52.42.mp4

MacOS: Desktop

Screen.Recording.2025-08-20.at.16.52.54.mp4

…mansion-labs/expensify-app-fork into fix-reload-on-new-sign-in-page

…rd03/fix-reload-on-new-sign-in-page

Julesssss · 2025-08-26T16:30:26Z

src/pages/signin/SignInModal.tsx

    const session = useSession();
+    // Use of SignInPageWrapped (with shouldEnableMaxHeight prop in SignInPageWrapper) is a workaround for Safari not supporting interactive-widget=resizes-content.
+    // This allows better scrolling experience after keyboard shows for modals with input, that are larger than remaining screen height.
+    // More info https://github.com/Expensify/App/pull/62799#issuecomment-2943136220.


war-in

Great job overall! Just a few comments

war-in · 2025-08-27T12:20:00Z

src/pages/signin/SignInModal.tsx

+    // Use of SignInPageWrapped (with shouldEnableMaxHeight prop in SignInPageWrapper) is a workaround for Safari not supporting interactive-widget=resizes-content.
+    // This allows better scrolling experience after keyboard shows for modals with input, that are larger than remaining screen height.
+    // More info https://github.com/Expensify/App/pull/62799#issuecomment-2943136220.
+    const SignInPageBase = isMobileSafari() ? SignInPageWrapped : SignInPage;


Let's maybe wrap this in useCallback to compute the value only once (it won't change)

You're right. The idea of memoization slipped my mind. It makes perfect sense 👍
I've committed the addition of useMemo

war-in · 2025-08-27T12:26:38Z

src/pages/signin/SignInPage.tsx

-            testID={SignInPageWrapper.displayName}
+            testID="SignInPageWrapper"


Let's revert this change

You're totally right. That's what I intended to do

war-in · 2025-08-27T12:28:33Z

src/pages/signin/SignInPage.tsx

    useImperativeHandle(ref, () => ({
        navigateBack,
    }));
-    useHandleBackButton(navigateBack);


Why was this removed? 🤔

I must have left it by mistake. It stemmed from investigating a bug I recently encountered in the Android app and yet not reported. When in the SignInModal and clicking the Android hardware back button, not only does the modal close as expected, but the entire app also closes. This bug does not occur after the deletion you mentioned. Of course, this change should not be part of this PR, and the issue should be addressed in a different PR. I’ll report the bug and would be happy to work on resolving it.

Glad you noticed. Thank you 🙇

OlGierd03 · 2025-08-27T16:48:09Z

I noticed the unit test failed and will look into it shortly.

war-in · 2025-08-28T06:06:09Z

@OlGierd03 the failing test should be fixed with this PR - #69398
It's unrelated to your changes 🎉

melvin-bot · 2025-08-28T09:42:45Z

@jjcoffee Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

jjcoffee · 2025-08-28T14:03:46Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

android-app-2025-08-29_16.33.28.mp4

Android: mWeb Chrome

android-chrome-2025-08-29_16.38.05.mp4

iOS: HybridApp

ios-app-2025-08-29_15.35.52.mp4

iOS: mWeb Safari

ios-safari-2025-08-29_15.39.23.mp4

MacOS: Chrome / Safari

desktop-chrome-2025-08-28_16.43.29.mp4

MacOS: Desktop

desktop-app-2025-08-29_17.01.56.mp4

jjcoffee · 2025-08-28T15:24:14Z

Will continue testing tomorrow - having some issues with native builds at the moment.

OlGierd03 · 2025-08-28T15:49:51Z

Small issue that I can't repro on staging. When I tap the Sign in button on web on the bottom right, the screen flashes blank briefly before the modal opens.

Hi, the issue you're talking about has been reported and the solution has recently been deployed to staging, so the problem should not occur. I personally do not encounter the issue on staging, as the video shows. Moreover, the issue regarding the extra padding above the keyboard only occurs on the Android app, and the issue regarding extra padding above the "Done" row in the language menu only occurs on the iOS app, so neither is reproducible on the web.

Screen.Recording.2025-08-28.at.17.19.45.mov

Julesssss

@OlGierd03 could you merge main into this branch please

jjcoffee · 2025-08-29T12:14:48Z

@OlGierd03 Nice, looks like it's resolved now after you merged main!

jjcoffee · 2025-08-29T13:29:45Z

Uploading ScreenRecording_08-26-2025 15-48-16_1.mp4…

@OlGierd03 Looks like your iOS native recording failed to upload, can you upload it again?

Also, did you test with HybridApp and if so, how did you deep-link to the public room? I can't seem to get it to work!

jjcoffee · 2025-08-29T13:38:37Z

Is the expected behaviour that the language selector actually hides part of the footer? This is on iOS standalone:

OlGierd03 · 2025-08-29T14:36:30Z

Looks like your iOS native recording failed to upload, can you upload it again?

You're right. My bad. Fixed it.

Also, did you test with HybridApp and if so, how did you deep-link to the public room? I can't seem to get it to work!

I did. I've had the same problem, so I worked on a workaround. In the SignInPage, I added an auxiliary, temporary button that has a function called openReportFromDeepLink assigned to the onPress prop. Overall, these are the changes that enabled me to use deep link functionality on iOS HybridApp:

SignInPage.tsx - addition of the Button with correct imports:

<Button onPress={() => openReportFromDeepLink(ROUTES.PUBLIC_REPORT, undefined, undefined, undefined)} />

ROUTES.ts - addition of the deep link route used in the button onPress prop openReportFromDeepLink (e.g.):

PUBLIC_REPORT: 'https://dev.new.expensify.com:8082/r/5583419180793784',

OlGierd03 · 2025-08-29T14:56:37Z

Is the expected behaviour that the language selector actually hides part of the footer?

I've focused on the removal of the additional padding above the selector and never considered that it might be expected to push the page with the footer above the selector so it would be fully visible. Previously, before those changes, the footer and selector behaved the same way; the only difference was the additional padding. I propose changing this behaviour in another issue, if necessary.

jjcoffee · 2025-08-29T15:03:14Z

Agreed! And thanks for the workaround, that saved me a bunch of time 😄

jjcoffee

LGTM and tests well!

OSBotify · 2025-08-29T16:46:28Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OlGierd03 · 2025-09-02T17:56:10Z

There is an issue with this PR. When anonymous users log in through the SignInModal, the modal doesn't get properly removed from the navigation stack. This means users can still go back to the login screen (after they're already signed in). I'm currently working on the fix.

Julesssss · 2025-09-02T22:06:47Z

There is an issue with this PR. When anonymous users log in through the SignInModal, the modal doesn't get properly removed from the navigation stack. This means users can still go back to the login screen (after they're already signed in). I'm currently working on the fix.

Thanks for raising, I created an issue here where we can work on a fix.

OSBotify · 2025-09-02T22:47:25Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.2.1-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OlGierd03 · 2025-09-03T16:28:21Z

There is an issue with this PR. When anonymous users log in through the SignInModal, the modal doesn't get properly removed from the navigation stack. This means users can still go back to the login screen (after they're already signed in). I'm currently working on the fix.

I was mistaken. This PR does not create a regression and is not the cause of this issue. I'm still working on finding the fix.

OSBotify · 2025-09-05T19:34:24Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.1-20 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OlGierd03 added 14 commits July 23, 2025 13:12

Remove no longer necessary forwardRef

95d4902

Make ref optional instead of possibly null

562d4e9

Merge branch 'fix-reload-on-new-sign-in-page' of github.com:software-…

3aa8c73

…mansion-labs/expensify-app-fork into fix-reload-on-new-sign-in-page

Fix import for web

be770c2

Trying to fix the keyboard issue in the SignInModal

7cf53e4

Workaround for Safari scrolling issue

cfd3579

Resolve styles conflict

41cfbd4

Improve readability by refactoring SignInPageBase

cae910c

Explain SignInPageWrapperProps prop shouldUseStyles

dbbc8e4

Merge branch 'main' into @OlGierd03/fix-reload-on-new-sign-in-page

f310d05

Merge branch 'migrate-hybrid-app-to-new-dot-sign-in-page' into @OlGie…

f3e5429

…rd03/fix-reload-on-new-sign-in-page

Resolve styling issues in theme context components

9d69855

Merge branch 'migrate-hybrid-app-to-new-dot-sign-in-page' into @OlGie…

093b6e5

…rd03/fix-reload-on-new-sign-in-page

Fix typo

dde9ca0

melvin-bot bot assigned OlGierd03 Aug 26, 2025

OlGierd03 mentioned this pull request Aug 26, 2025

[$250] [Due for payment 2025-09-12] SignInModal shifts when keyboard appears #69068

Closed

Julesssss self-requested a review August 26, 2025 16:29

Julesssss reviewed Aug 26, 2025

View reviewed changes

war-in reviewed Aug 27, 2025

View reviewed changes

OlGierd03 added 3 commits August 27, 2025 14:54

Good practices with SignInWrapper displayName

2bd54c7

Add SignInPageBase memoization

03dc29f

Revert useHandleBackButton deletion

4e36999

war-in approved these changes Aug 28, 2025

View reviewed changes

OlGierd03 marked this pull request as ready for review August 28, 2025 09:42

OlGierd03 requested a review from a team as a code owner August 28, 2025 09:42

melvin-bot bot requested a review from jjcoffee August 28, 2025 09:42

melvin-bot bot removed the request for review from a team August 28, 2025 09:42

This comment was marked as resolved.

Sign in to view

Julesssss reviewed Aug 28, 2025

View reviewed changes

Merge branch 'main' into @OlGierd03/fix-reload-on-new-sign-in-page

86f5497

OlGierd03 requested a review from a team as a code owner August 29, 2025 09:47

jjcoffee approved these changes Aug 29, 2025

View reviewed changes

melvin-bot bot requested a review from Julesssss August 29, 2025 15:03

Julesssss approved these changes Aug 29, 2025

View reviewed changes

Julesssss merged commit 0426f5f into Expensify:main Aug 29, 2025
22 checks passed

Julesssss mentioned this pull request Sep 2, 2025

[HOLD] Revert "Fix the issue with the padding above keyboard in the SignInModal along with derivatives" #69691

Closed

49 tasks

OSBotify mentioned this pull request Sep 2, 2025

Deploy Checklist: New Expensify 2025-09-02 #69693

Closed

OlGierd03 mentioned this pull request Sep 3, 2025

[Due for payment 2025-09-17] Anon users signing in can navigate back to authentication page #69692

Closed

16 tasks

melvin-bot bot mentioned this pull request Sep 5, 2025

[Due for payment 2025-09-12] iOS - Login - Extra padding above "Done" row in language menu when accessed via public room #67863

Closed

8 tasks

		testID={SignInPageWrapper.displayName}
		testID="SignInPageWrapper"

Fix the issue with the padding above keyboard in the SignInModal along with derivatives #69267

Fix the issue with the padding above keyboard in the SignInModal along with derivatives #69267

Conversation

OlGierd03 commented Aug 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Julesssss Aug 26, 2025

Choose a reason for hiding this comment

Uh oh!

war-in left a comment

Choose a reason for hiding this comment

Uh oh!

war-in Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

OlGierd03 Aug 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

war-in Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

OlGierd03 Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

war-in Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

OlGierd03 Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

OlGierd03 commented Aug 27, 2025

Uh oh!

war-in commented Aug 28, 2025

Uh oh!

melvin-bot bot commented Aug 28, 2025

Uh oh!

jjcoffee commented Aug 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

This comment was marked as resolved.

jjcoffee commented Aug 28, 2025

Uh oh!

OlGierd03 commented Aug 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Aug 29, 2025

Uh oh!

jjcoffee commented Aug 29, 2025

Uh oh!

jjcoffee commented Aug 29, 2025

Uh oh!

OlGierd03 commented Aug 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OlGierd03 commented Aug 29, 2025

Uh oh!

jjcoffee commented Aug 29, 2025

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Aug 29, 2025

Uh oh!

OlGierd03 commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OlGierd03 commented Aug 26, 2025 •

edited

Loading

OlGierd03 Aug 27, 2025 •

edited

Loading

jjcoffee commented Aug 28, 2025 •

edited

Loading

OlGierd03 commented Aug 28, 2025 •

edited

Loading

OlGierd03 commented Aug 29, 2025 •

edited

Loading

OlGierd03 commented Sep 2, 2025 •

edited

Loading