Fix/46488 fix modal centering #46860

koko57 · 2024-08-06T08:36:35Z

Details

Fixed Issues

$ #46488
PROPOSAL: -

Tests

PREREQUISITES: you need to have all betas / workspaceFeeds beta enabled

Go to Workspaces -> select a workspace -> go to More Features -> enable Expensify Card.
Go to Expensify Card -> Issue New Card -> select bank account.
After selecting bank account go back (on mobile) or close RHP.
Verify that you see a modal and the modal is centered relative to the background with the skeletons. When testing web/destop first check it full-sized, then narrow down the browser/app window until the LHN disappears.
Additionally, check that the content is scrollable and immediately after the scroll down the disclaimer text is shown.

Verify that no errors appear in the JS console

Offline tests

QA Steps

PREREQUISITES: you need to have all betas / workspaceFeeds beta enabled

Go to Workspaces -> select a workspace -> go to More Features -> enable Expensify Card.
Go to Expensify Card -> Issue New Card -> select bank account.
After selecting bank account go back (on mobile) or close RHP.
Verify that you see a modal and the modal is centered relative to the background with the skeletons.
Additionally, check that the content is scrollable and immediately after the scroll down a disclaimer text is shown.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-08-06T09:01:01Z

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

DylanDylann · 2024-08-06T09:34:14Z

src/pages/workspace/expensifyCard/EmptyCardView.tsx

 import colors from '@styles/theme/colors';
 import CONST from '@src/CONST';

 const HEADER_HEIGHT = 80;
 const BUTTON_HEIGHT = 40;
 const BUTTON_MARGIN = 12;

+const isIOSNative = getPlatform() === CONST.PLATFORM.IOS;


Avoid using getPlatform in our App

+1 we should refactor into platform specific files

DylanDylann · 2024-08-06T09:38:42Z

src/pages/workspace/expensifyCard/EmptyCardView.tsx

 function EmptyCardView() {
    const {translate} = useLocalize();
    const styles = useThemeStyles();
    const {windowHeight, isSmallScreenWidth} = useWindowDimensions();

-    const headerHeight = isSmallScreenWidth ? HEADER_HEIGHT + BUTTON_HEIGHT + BUTTON_MARGIN : HEADER_HEIGHT;
+    const safeAreaInsets = useSafeAreaInsets();
+    const headerHeight = isSmallScreenWidth ? HEADER_HEIGHT + BUTTON_HEIGHT + BUTTON_MARGIN + (isIOSNative ? safeAreaInsets.top : 0) : HEADER_HEIGHT;


@koko57 We should create a function to get headerHeight and incorporating specific logic for each platform determined by the file name. See getPlaidLinkTokenParameters function as an example

we're using getPlatform in ComposerWithSuggestions, so why not use it here? For ios it would need to be a hook, not a regular function or we would need to pass safeAreaInsets as a param to the function and would need to ignore it for web/android implementation? I think it's unnecessary complication as we have getPlatform

@koko57 It isn't recommended in our codebase. Please see this guideline

App/contributingGuides/PR_REVIEW_GUIDELINES.md

Line 45 in 3775dae

3. Platform-specific files should follow the proper naming convention (see [Platform-Specific File Extensions](https://github.com/expensify/app#platform-specific-file-extensions))

cc @mountiny @MariaHCD (This PR belongs to Workspace Feed Project) Tag you guys to confirm

@koko57 Any update here?

@DylanDylann I don't see using getPlatform is discouraged, only a proper naming is mentioned. I think in this case we don't need platform specific function as it creates more unnecessary complexity.

curious wdyt @mountiny

@koko57 I am with @DylanDylann we should create platform specific files and that is the best practice even if its.a bit more boilerplate

mountiny

Agreed with Dylan

koko57 · 2024-08-08T11:11:41Z

ok, done

koko57 · 2024-08-08T13:59:18Z

@DylanDylann ready for review

DylanDylann · 2024-08-09T04:18:58Z

@koko57 Also please check this comment: #45690 (comment)

src/hooks/useEmptyViewHeaderHeight/index.ios.ts

DylanDylann · 2024-08-09T04:38:17Z

@mountiny The UI looks good to me. Do we need to build ad-hoc and request a review from the design team?

src/hooks/useEmptyViewHeaderHeight/CONST.ts

DylanDylann · 2024-08-09T04:49:17Z

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 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.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(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.
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

Screen.Recording.2024-08-09.at.11.46.56.mov

Android: mWeb Chrome

Screen.Recording.2024-08-09.at.11.36.43.mov

iOS: Native

Screen.Recording.2024-08-09.at.11.47.17.mov

iOS: mWeb Safari

Screen.Recording.2024-08-09.at.11.35.47.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-09.at.11.34.40.mov

MacOS: Desktop

Screen.Recording.2024-08-09.at.11.24.38.mov

mountiny · 2024-08-09T14:27:03Z

@Expensify/design Just before merging this PR, do you want to leave this a review? there are screenshots of how this looks in the PR checklist. Thanks!

shawnborton · 2024-08-09T16:14:42Z

Screenshots seem to look good to me. I would love a screen recording of someone changing their screen size to make sure it's still all good and responsive.

koko57 · 2024-08-09T16:33:25Z

@shawnborton here's the recording 🙂
https://github.com/user-attachments/assets/73875d1b-3f3b-47ef-beaa-6ce6116f6053

shawnborton · 2024-08-09T16:39:28Z

That looks great!

DylanDylann · 2024-08-10T04:14:49Z

@mountiny All yours

mountiny

Perfect, thanks everyone!

OSBotify · 2024-08-12T00:28:05Z

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

Beamanator · 2024-08-14T20:53:23Z

FYI I believe this was deployed to prod yesterday, from this checklist - #47219

koko57 added 2 commits August 1, 2024 20:02

fix: fix modal centering

2ec946b

fix: resolve conflicts

490dfd5

koko57 marked this pull request as ready for review August 6, 2024 09:00

koko57 requested a review from a team as a code owner August 6, 2024 09:00

melvin-bot bot requested a review from DylanDylann August 6, 2024 09:01

melvin-bot bot removed the request for review from a team August 6, 2024 09:01

koko57 mentioned this pull request Aug 6, 2024

Expensify Card - Empty state card is top centered instead of middle centered #46488

Closed

6 tasks

DylanDylann reviewed Aug 6, 2024

View reviewed changes

mountiny requested changes Aug 8, 2024

View reviewed changes

koko57 added 2 commits August 8, 2024 12:30

Merge branch 'main' into fix/46488-fix-modal-centering

3591892

fix: create platform specific hooks

454a736

koko57 requested review from DylanDylann and mountiny August 8, 2024 11:47

mountiny assigned koko57 Aug 8, 2024

DylanDylann reviewed Aug 9, 2024

View reviewed changes

src/hooks/useEmptyViewHeaderHeight/index.ios.ts Show resolved Hide resolved

DylanDylann reviewed Aug 9, 2024

View reviewed changes

src/hooks/useEmptyViewHeaderHeight/CONST.ts Outdated Show resolved Hide resolved

mountiny added the Ready To Build label Aug 9, 2024

mountiny requested a review from a team August 9, 2024 14:26

fix: rename file

114d61b

DylanDylann approved these changes Aug 10, 2024

View reviewed changes

mountiny approved these changes Aug 12, 2024

View reviewed changes

mountiny merged commit a5b4b64 into Expensify:main Aug 12, 2024
16 checks passed

github-actions bot mentioned this pull request Aug 12, 2024

Deploy Checklist: New Expensify 2024-08-12 #47219

Closed

90 tasks

IuliiaHerets mentioned this pull request Aug 12, 2024

[Workspace Feeds] Web - Card - Added bank account isn't showing for Expensify Card #47239

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/46488 fix modal centering #46860

Fix/46488 fix modal centering #46860

koko57 commented Aug 6, 2024 •

edited by github-actions bot

Loading

melvin-bot bot commented Aug 6, 2024

DylanDylann Aug 6, 2024

mountiny Aug 8, 2024

DylanDylann Aug 6, 2024

koko57 Aug 6, 2024

DylanDylann Aug 6, 2024

DylanDylann Aug 6, 2024

DylanDylann Aug 8, 2024

koko57 Aug 8, 2024

mountiny Aug 8, 2024

mountiny left a comment

koko57 commented Aug 8, 2024

koko57 commented Aug 8, 2024

DylanDylann commented Aug 9, 2024

DylanDylann commented Aug 9, 2024

DylanDylann commented Aug 9, 2024

mountiny commented Aug 9, 2024

shawnborton commented Aug 9, 2024

koko57 commented Aug 9, 2024

shawnborton commented Aug 9, 2024

DylanDylann commented Aug 10, 2024

mountiny left a comment

OSBotify commented Aug 12, 2024

Beamanator commented Aug 14, 2024

Fix/46488 fix modal centering #46860

Fix/46488 fix modal centering #46860

Conversation

koko57 commented Aug 6, 2024 • edited by github-actions bot Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

koko57 commented Aug 8, 2024

koko57 commented Aug 8, 2024

DylanDylann commented Aug 9, 2024

DylanDylann commented Aug 9, 2024

DylanDylann commented Aug 9, 2024

Reviewer Checklist

Screenshots/Videos

mountiny commented Aug 9, 2024

shawnborton commented Aug 9, 2024

koko57 commented Aug 9, 2024

shawnborton commented Aug 9, 2024

DylanDylann commented Aug 10, 2024

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 12, 2024

Beamanator commented Aug 14, 2024

koko57 commented Aug 6, 2024 •

edited by github-actions bot

Loading