Skip to content

Money request header scrollable #21918

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.

Sign up for GitHub

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

Jump to bottom
Merged
madmax330 merged 22 commits into from
Jul 10, 2023
Merged

Money request header scrollable #21918

madmax330 merged 22 commits into from
Jul 10, 2023

Conversation

@ShogunFire
Copy link
Contributor

@ShogunFire ShogunFire commented Jun 29, 2023 •
edited
Loading

Details

We are dividing the header in two part and one part is going to be in the list, we put it as the footer even if we want it to act like a header because the list in inverted. We are doing this change because the header was taking too much space on little screens.

Fixed Issues

$ #19389
PROPOSAL: #19389 (comment)

Tests

  1. Go to staging dot on mweb chrome
  2. Click on + icon
  3. Select request money > enter amount
  4. Select a contact and submit
  5. Click on the payment request in the new DM
  6. This takes you to a new screen
  7. Verify that the header composed of:
  • Mail 1
  • To
  • Mail 2
  • Amount
  • Description
  • Date
    is shown at the top
  1. Open the keyboard and write some messages until the messages reach the header
  2. Verify that only Mail1 stays fix and the rest of the header become scrollable
  • Verify that no errors appear in the JS console

Offline tests

  1. Turn your connection off
  2. Do the same steps as above
  3. Verify that everything that needs to be grey is grey

QA Steps

  1. Go to staging dot on mweb chrome
  2. Click on + icon
  3. Select request money > enter amount
  4. Select a contact and submit
  5. Click on the payment request in the new DM
  6. This takes you to a new screen
  7. Verify that the header composed of:
  • Mail 1
  • To
  • Mail 2
  • Amount
  • Description
  • Date
    is shown at the top
  1. Open the keyboard and write some messages until the messages reach the header
  2. Verify that only Mail1 stays fix and the rest of the header become scrollable
  • 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 / Chrome
    • iOS / native
    • iOS / 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
    • 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 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

Web
2023-06-20.10-01-45.mp4
Mobile Web - Chrome
2023-06-20.10-03-39.mp4
Mobile Web - Safari
2023-06-20.10-25-46.mp4
Desktop
2023-06-20.11-01-43.mp4
iOS
2023-06-20.11-10-07.mp4
Android
2023-06-20.11-12-52.mp4

@ShogunFire
Make part of MoneyRequestHeader scrollable, the top of the header sta…
780477c 
…ys fixed, the other part is moved as a footer of the InvertedFlatList which makes it a header

Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
ListFooterComponentStyle was overwritten so the header was at the bottom
bc80a96 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Merge remote-tracking branch 'origin/main' into moneyRequestHeaderScr…
710dbd0 
…ollable

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

# Conflicts:
#	src/components/MoneyRequestHeader.js
#	src/pages/home/report/ReportActionsList.js
#	src/pages/home/report/ReportActionsView.js
@ShogunFire
Merge was wrong, it looks like we use the Id now instead of the email
367261d 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Another problem with the merge, we use the id now
7bab3f1 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Merge branch 'main' into moneyRequestHeaderScrollable
795295a 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>

# Conflicts:
#	src/pages/home/ReportScreen.js
#	src/pages/home/report/ReportActionsList.js
#	src/pages/home/report/ReportActionsView.js
@ShogunFire
Changing names of files
f60c83c 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire ShogunFire requested a review from a team as a code owner June 29, 2023 23:39
@melvin-bot melvin-bot bot requested review from aimane-chnaif and removed request for a team June 29, 2023 23:39
@melvin-bot
Copy link

melvin-bot bot commented Jun 29, 2023

@aimane-chnaif 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]

@ShogunFire
Fix problem with merging
bce157a 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Fixing the merge again
89cedaf 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
I changed that but I don't know why so I changed it back
1c0af6e 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Correct one lint error
6b961a1 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Correct Lint errors
fc5b73a 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
just to fix lint errors, for the props validation
8e1432a 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Copy link
Contributor Author

ShogunFire commented Jun 30, 2023

Hello @aimane-chnaif, it looks like there is a lint problem unrelated to my code, I ran npm run lint on my computer and fixed some errors even if I think there are still some syntax errors that they don't tell me, I also changed the name of the files as MaciejSWM suggested.

The biggest change from the initial branch is the android version of InvertedList, I did it because Lint asked me to validate the props, I copied the way it was done in index.js I hope it's good.

Maybe you can start the review until they fix the lint error, thanks

@ShogunFire ShogunFire mentioned this pull request Jun 30, 2023
Merged
55 tasks
@ShogunFire
After run prettier
61985bc 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
AndrewGable
AndrewGable previously requested changes Jun 30, 2023
View reviewed changes
@ShogunFire
Revert "Try with former lint version because new one seem to bug"
54f6edd 
This reverts commit 837f690.

Signed-off-by: Pierre Michel <pmiche04@gmail.com>
AndrewGable
AndrewGable reviewed Jun 30, 2023
View reviewed changes
Copy link
Contributor

@AndrewGable AndrewGable left a comment

Choose a reason for hiding this comment

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

Looks like lint is passing now 👍

Screenshot 2023-06-30 at 12 59 03 PM

@AndrewGable AndrewGable self-requested a review June 30, 2023 19:00
@ShogunFire
Copy link
Contributor Author

ShogunFire commented Jun 30, 2023

Yes... Weird... Thank you @AndrewGable

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Jul 3, 2023

This should have been done in proposal stage but we need design approval from design team.

@shawnborton can you please provide feedback on these?

Web:

Screen.Recording.2023-07-03.at.6.29.19.PM.mov

iOS:

Screen.Recording.2023-07-03.at.6.29.56.PM.mov

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Jul 3, 2023

@ShogunFire please fix conflict while waiting for feedback. Also I am seeing prop type console error in android

@aimane-chnaif aimane-chnaif mentioned this pull request Jul 3, 2023
Closed
6 tasks
@shawnborton
Copy link
Contributor

shawnborton commented Jul 5, 2023

But if we're just breaking the changes out into chunks, I suppose this is fine?

@trjExpensify
Copy link
Contributor

trjExpensify commented Jul 5, 2023

Here's the main issue we were going from, I don't think this PR has come from it, and the changes to avatars and headers were being taken care of by @chiragsalian and @grgia. It does seem a bit unclear though, but I'll take that to the main issue and not in this PR.

@trjExpensify trjExpensify mentioned this pull request Jul 5, 2023
Closed
4 tasks
@madmax330
Copy link
Contributor

madmax330 commented Jul 6, 2023

@trjExpensify so are we good to go with this PR or are we holding it for something?

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Jul 6, 2023

@trjExpensify so are we good to go with this PR or are we holding it for something?

I think we are good. From #20486 (comment), there was a concern about background but it seems follow-up. The purpose of this PR is to move money request "header" from top fixed view to scrollable view based on current old design. The new design changes will be done as next steps but not in this PR.

@trjExpensify
Copy link
Contributor

trjExpensify commented Jul 6, 2023

@trjExpensify so are we good to go with this PR or are we holding it for something?

Yup, consensus in the main issue was that there isn't a conflict 👍

@AndrewGable AndrewGable removed their request for review July 6, 2023 20:25
@ShogunFire
Merge branch 'main' into moneyRequestHeaderScrollable
c24c9d7 
Signed-off-by: Pierre Michel <pmiche04@gmail.com>

# Conflicts:
#	src/pages/home/report/ReportActionsView.js
@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Jul 7, 2023

@madmax330 kindly bump for review. to avoid more conflicts

@madmax330 madmax330 merged commit 4f398db into Expensify:main Jul 10, 2023
@melvin-bot
Copy link

melvin-bot bot commented Jul 10, 2023

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

@Julesssss
Copy link
Contributor

Julesssss commented Jul 10, 2023 •
edited
Loading

There was an outstanding lint issue here, maybe a new check was added recently?

13:8 error 'themeColors' is defined but never used no-unused-vars

@madmax330 madmax330 mentioned this pull request Jul 10, 2023
Merged
58 tasks
@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Jul 10, 2023

It seems that came from merge. On this branch itself, there was no lint issue.

@Julesssss
Copy link
Contributor

Julesssss commented Jul 10, 2023 •
edited
Loading

It's likely we recently added/updated a check on main. So the issue wouldn't have been seen until the changes were merged with main (or main merged to the branch). Anyway, solved now 👍

@OSBotify OSBotify mentioned this pull request Jul 10, 2023
Closed
76 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Jul 11, 2023

🚀 Deployed to staging by https://github.com/madmax330 in version: 1.3.39-0 🚀

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

@mvtglobally
Copy link

mvtglobally commented Jul 11, 2023

@ShogunFire @aimane-chnaif @madmax330 @AndrewGable No QA needed here?

@ShogunFire
Copy link
Contributor Author

ShogunFire commented Jul 11, 2023

@mvtglobally Oups, looks like I forgot to add test steps sorry, I am doing this now

@ShogunFire
Copy link
Contributor Author

ShogunFire commented Jul 11, 2023

@mvtglobally I have added the steps

@ShogunFire
Copy link
Contributor Author

ShogunFire commented Jul 11, 2023 •
edited
Loading

And I guess I should follow the PR steps better next time because I just found a bug, when we are offline the scrollable header is not greyed out

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Jul 11, 2023

And I guess I should follow the PR steps better next time because I just found a bug, when we are offline the scrollable header is not greyed out

Good catch. Not sure if we should fix it as a follow-up as money request header will be refactored again in #22484

@grgia
Copy link
Contributor

grgia commented Jul 11, 2023

I think we can omit a follow up PR @ShogunFire, I decided to refactor this flow so I'll handle it in the linked PRs. cc @aimane-chnaif

@lanitochka17 lanitochka17 mentioned this pull request Jul 11, 2023
Closed
6 tasks
@ShogunFire
Copy link
Contributor Author

ShogunFire commented Jul 11, 2023 •
edited
Loading

@aimane-chnaif @grgia Are you sure we can just ignore it ? It is now a deploy blocker :(

I have a branch ready for a PR: https://github.com/ShogunFire/App/tree/fixScrollableHeaderOffline

@madmax330
Copy link
Contributor

madmax330 commented Jul 11, 2023

@ShogunFire Go ahead and create your PR and we'll review

@luacmartins luacmartins mentioned this pull request Jul 13, 2023
Merged
57 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Jul 13, 2023

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.39-11 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndrewGable AndrewGable AndrewGable left review comments

@madmax330 madmax330 madmax330 approved these changes

+1 more reviewer

@aimane-chnaif aimane-chnaif aimane-chnaif approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@ShogunFire @aimane-chnaif @shawnborton @trjExpensify @madmax330 @Julesssss @OSBotify @mvtglobally @grgia @AndrewGable