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 17866: After pressing the back arrow to "Send/Request money" screen, the keyboard flashes #30065

Merged
merged 9 commits into from
Nov 1, 2023

Conversation

sarious
Copy link
Contributor

@sarious sarious commented Oct 20, 2023

@fedirjh

Details

After pressing the back arrow to "Send/Request money" screen, the App view height is increasing, because of Virtual Keyboard.

Fixed Issues

$ #17866
PROPOSAL: #17866 (comment)

Tests

  1. Open app on Android
  2. Log in with any account
  3. Tap on the FAB (+) button
  4. Tap on 'Request Money'
  5. Check that 'Manual' tab selected or Choose 'Manual'
  6. Add an amount
  7. Tap on the 'Next' button
  8. Wait until virtual keyboard is opened or Manually click input with 'Name, email or phone number' to open virtual keyboard
  9. Tap on the back arrow
  • Verify that no errors appear in the JS console

Offline tests

The same as above

QA Steps

  1. Open app on Android
  2. Log in with any account
  3. Tap on the FAB (+) button
  4. Tap on 'Request Money'
  5. Check that 'Manual' tab selected or Choose 'Manual'
  6. Add an amount
  7. Tap on the 'Next' button
  8. Wait until virtual keyboard is opened or Manually click input with 'Name, email or phone number' to open virtual keyboard
  9. Tap on the back arrow
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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.
  • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
android_native.mov
Android: mWeb Chrome
android_chrome.mov
iOS: Native
ios_native.mov
iOS: mWeb Safari
ios_safari.mov
MacOS: Chrome / Safari

image

MacOS: Desktop image

@github-actions
Copy link
Contributor

github-actions bot commented Oct 20, 2023

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@sarious
Copy link
Contributor Author

sarious commented Oct 20, 2023

I have read the CLA Document and I hereby sign the CLA

@sarious sarious marked this pull request as ready for review October 20, 2023 14:38
@sarious sarious requested a review from a team as a code owner October 20, 2023 14:38
@melvin-bot melvin-bot bot requested review from fedirjh and removed request for a team October 20, 2023 14:38
@melvin-bot
Copy link

melvin-bot bot commented Oct 20, 2023

@fedirjh 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]

@fedirjh
Copy link
Contributor

fedirjh commented Oct 23, 2023

@sarious Let's fix the bug inside the edit money request flow:

CleanShot.2023-10-23.at.03.07.57.mp4

@fedirjh
Copy link
Contributor

fedirjh commented Oct 24, 2023

@sarious Can you address these #30065 (comment) and #30065 (comment) ?

@sarious
Copy link
Contributor Author

sarious commented Oct 24, 2023

@sarious Let's fix the bug inside the edit money request flow:

CleanShot.2023-10-23.at.03.07.57.mp4

Yes, I'll do it. Just want to fix the issue with the vertical insets, when buttons are covered by "Home bar".

@sarious
Copy link
Contributor Author

sarious commented Oct 24, 2023

Can you address these

Do you want me to fix this issues? If yes, I'll do it.
On iOS everything works fine now, but just have some issues while running native app on Android (App is not opening).

@fedirjh
Copy link
Contributor

fedirjh commented Oct 24, 2023

Do you want me to fix this issues?

Yes, let's cover the money request edit amount in this PR.

just have some issues while running native app on Android (App is not opening).

is it a problem with the emulator?

@sarious
Copy link
Contributor Author

sarious commented Oct 24, 2023

Yes, let's cover the money request edit amount in this PR.

I'll do it, no problem.

is it a problem with the emulator?

Yes, the application does not open in the emulator, I see a black screen only.

@sarious
Copy link
Contributor Author

sarious commented Oct 24, 2023

@fedirjh I've fixed the problem with bottom inset, when button in the bottom os screen was covered by system Home bar.
Also I've fixed the bug inside the edit money request flow.
So I've checked this on iOS and Android, everything is good!

@sarious
Copy link
Contributor Author

sarious commented Oct 24, 2023

Updated all the videos.

@sarious
Copy link
Contributor Author

sarious commented Oct 27, 2023

@fedirjh Excuse me, could you please take a look my merge request?
Time is passing, it was prepared 3 days ago and it may become more difficult to merge due to new commits.
I was counting on a bonus, but now I'm thinking how not to get a penalty for the delay.

@fedirjh
Copy link
Contributor

fedirjh commented Oct 27, 2023

Sorry for the delay here, I was facing some problems with my Android emulator.


@sarious I have weird bug on IOS native: switching between tabs in money request is not smooth. at some point it just stops responding:

CleanShot.2023-10-27.at.18.43.20.mp4

@fedirjh
Copy link
Contributor

fedirjh commented Oct 27, 2023

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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.js 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(themeColors.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 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.
  • 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: Native
Android.mp4
Android: mWeb Chrome
mchrome1.mp4
mchrome2.mp4
iOS: Native https://github.com/Expensify/App/assets/36869046/32621960-bca2-4e14-94e1-157970e4e1e2
iOS: mWeb Safari
web.mp4
MacOS: Chrome / Safari
safari.mp4
MacOS: Desktop
CleanShot.2023-10-27.at.19.22.59.mp4

@sarious
Copy link
Contributor Author

sarious commented Oct 30, 2023

@fedirjh I've applied the logic for all tabs as you said in comment. Also I've resolved all merge conflicts and check the app. So I look forward to your review and approve.

Copy link
Contributor

@fedirjh fedirjh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and tests well, left some comments about code style.

src/components/ScreenWrapper/index.js Outdated Show resolved Hide resolved
src/hooks/useInitialWindowDimensions/index.native.js Outdated Show resolved Hide resolved
src/pages/EditRequestAmountPage.js Outdated Show resolved Hide resolved
src/pages/iou/MoneyRequestSelectorPage.js Outdated Show resolved Hide resolved
@sarious
Copy link
Contributor Author

sarious commented Oct 31, 2023

Looks good and tests well, left some comments about code style.

I've resolved all notes: added aliases and get rid of useInitialWindowDimensions/index.native.js

Copy link
Contributor

@fedirjh fedirjh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good to me.

@melvin-bot melvin-bot bot requested a review from luacmartins October 31, 2023 16:48
luacmartins
luacmartins previously approved these changes Oct 31, 2023
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@luacmartins
Copy link
Contributor

@sarious it seems like some commits are not verified. Can you please try to sign them? You can try the method below:

git -c core.editor=true rebase --exec 'git commit --amend --no-edit -n -S' -i $COMMIT_HASH

(assuming you have commit signing set up) the command above will automatically sign all the commits between $COMMIT_HASH and the current HEAD without requiring you to open an editor at any step. You'll typically also have to force-push to your branch when you're done.

@sarious
Copy link
Contributor Author

sarious commented Oct 31, 2023

Oh, I see, thank you for the script! I'll run it now.

…6-sign

* commit '342a2c4a63f61c9129873f3f0d4b0616ea9e8083': (1133 commits)
  Update version to 1.3.94-0
  Delete docs/articles/expensify-classic/expensify-card/CPA-Card.md
  Fix incorrect command name
  Build GH actions
  Update version to 1.3.93-1
  fix: prettier
  fix: add default value to the style props of OfflineIndicator
  remove console
  use the correct report data
  fix double borders
  fix double borders
  prettier
  Rebuild GH actions
  Bump ncc version
  Fix issue #Issue28820 - Small change
  Add a basic sitemap
  Include tsconfig in some action dependencies
  Prettier
  Fix tests
  Remove all --always flags
  ...

# Conflicts:
#	src/components/ScreenWrapper/index.js
#	src/pages/iou/MoneyRequestSelectorPage.js
@sarious
Copy link
Contributor Author

sarious commented Oct 31, 2023

So, there were some unsigned commits, some of them because of merges. I've sign them all and now everything looks good.

@luacmartins
Copy link
Contributor

@sarius lint is failing

@sarious
Copy link
Contributor Author

sarious commented Oct 31, 2023

Yes I noticed, I've already fixed it.

@sarious
Copy link
Contributor Author

sarious commented Oct 31, 2023

@luacmartins BTW, I was not able to apply to the Upwork job, because I've always had an error "This job is no longer available.". So it seems someone needs to reopen it.

@luacmartins luacmartins merged commit 0f21275 into Expensify:main Nov 1, 2023
12 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Nov 2, 2023

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.95-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Nov 6, 2023

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.95-9 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Nov 6, 2023

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.96-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Nov 9, 2023

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.96-15 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants