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: Add more space to bottom docked button #44761

Merged
merged 17 commits into from
Jul 25, 2024
Merged

Conversation

truph01
Copy link
Contributor

@truph01 truph01 commented Jul 3, 2024

Details

Fixed Issues

$ #44056
PROPOSAL: #44056 (comment)

Tests

  1. Open app
  2. Tap avatar
  3. Tap display name
  4. Observe the space at the bottom of docked button
  5. There should be proper bottom SafeSpace below the button
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

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

Screenshots/Videos

Android: Native Screenshot 2024-07-03 at 14 10 53
Android: mWeb Chrome Screenshot 2024-07-03 at 14 22 15
iOS: Native Screenshot 2024-07-03 at 14 09 59
iOS: mWeb Safari Screenshot 2024-07-03 at 14 21 09
MacOS: Chrome / Safari Screenshot 2024-07-03 at 14 19 09
MacOS: Desktop Screenshot 2024-07-03 at 14 17 58

Copy link

melvin-bot bot commented Jul 3, 2024

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@truph01 truph01 marked this pull request as ready for review July 3, 2024 07:23
@truph01 truph01 requested a review from a team as a code owner July 3, 2024 07:23
@melvin-bot melvin-bot bot requested review from allgandalf and removed request for a team July 3, 2024 07:23
Copy link

melvin-bot bot commented Jul 3, 2024

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

This comment has been minimized.

@shawnborton
Copy link
Contributor

Looking good, but here are spots where it's missing:

  • Wallet > Transfer Balance page
  • Workspace settings > Members > Invite new members

On the Edit expense details > Date screen, we have too much space below the Save button:
CleanShot 2024-07-03 at 10 16 13@2x

One interesting observation though... I feel like when the keyboard is up, we don't need the SafeSpace to show. Is there something we can do about that? Otherwise it feels like the gap below the Save button is way too large when the keyboard is visible.
CleanShot 2024-07-03 at 10 16 01@2x

@truph01
Copy link
Contributor Author

truph01 commented Jul 3, 2024

@shawnborton

Looking good, but here are spots where it's missing:
Wallet > Transfer Balance page
Workspace settings > Members > Invite new members

  • These screens do not use a form wrapper component, but the fix in this PR just applies to the bottom button in form wrapper component. If we need to fix these screen, we need to add the padding bottom to its bottom button manually. WDYT?

On the Edit expense details > Date screen, we have too much space below the Save button:

  • I fixed it

One interesting observation though... I feel like when the keyboard is up, we don't need the SafeSpace to show. Is there something we can do about that? Otherwise it feels like the gap below the Save button is way too large when the keyboard is visible.

  • I fixed it. Below is the result:
Screen.Recording.2024-07-03.at.15.59.10.mov

@shawnborton
Copy link
Contributor

we need to add the padding bottom to its bottom button manually. WDYT?

I think we should add the padding there for consistency. And we should check as many other pages as we can too to make sure we aren't missing any.

I fixed it. Below is the result:

Much better!

Comment on lines 69 to 70
useEffect(() => {
const keyboardWillShowListener = Keyboard.addListener('keyboardWillShow', () => {
Copy link
Contributor

@allgandalf allgandalf Jul 3, 2024

Choose a reason for hiding this comment

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

What does this useEffect do exactly?

@truph01
Copy link
Contributor Author

truph01 commented Jul 4, 2024

@allgandalf I updated PR. Now, I use the additional padding bottom style in FormAlertWithSubmitButton directly instead of styling <FormAlertWithSubmitButton containerStyles={[..., additionalPaddingBottomStyle]} ... /> in FormWrapper as I did before because, there is a lot of screens we do not use FormWrapper but still have docked button like mentioned above:

Looking good, but here are spots where it's missing:
Wallet > Transfer Balance page
Workspace settings > Members > Invite new members

@allgandalf
Copy link
Contributor

I will review this today

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

also are we covering all the cases with these changes?

src/hooks/useExtraSafePaddingBottomStyle.ts Outdated Show resolved Hide resolved
@truph01
Copy link
Contributor Author

truph01 commented Jul 10, 2024

also are we covering all the cases with these changes?

Yes


const useExtraSafePaddingBottomStyle = () => {
const styles = useThemeStyles();
const [willKeyboardShow, setWillKeyboardShow] = useState(false);
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you typecast the boolean type of the variable and also rename the variable to something more readable like:

isKeyboardVisible?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added the type for it. But I don't think we should rename the state, because as I mentioned above, willKeyboardShow is used to fix the issue didKeyboardShow encountered: There is a delay when the keyboard is visible by the user and the when didKeyboardShow is set to true. So it is not just isKeyboardVisible.

@shawnborton
Copy link
Contributor

Yeah, that looks better. Can you help me understand why the two of them are different though?

@allgandalf
Copy link
Contributor

The one i attached here are of the onboarding flow, and the one i attached here is of the display name (Both are from staging environment not related to our PR here but that really felt odd to me seeing so much bottom padding)

@allgandalf
Copy link
Contributor

allgandalf commented Jul 23, 2024

Yeah, that looks better. Can you help me understand why the two of them are different though?

We use KeyboardAvoidingView for the onboarding flow:

<KeyboardAvoidingView
style={[styles.flex1, styles.dFlex]}
behavior="padding"
>
<FormProvider
style={[styles.flexGrow1, shouldUseNarrowLayout && styles.mt5, styles.mb5, shouldUseNarrowLayout ? styles.mh8 : styles.mh5]}

And screenwrapper for the display name page:

<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableMaxHeight
testID={DisplayNamePage.displayName}
>
<HeaderWithBackButton

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

changes LGTM, looks good to be merged into staging

@melvin-bot melvin-bot bot requested a review from puneetlath July 23, 2024 10:42
@shawnborton
Copy link
Contributor

Got it. Yeah, ideally we use whatever is consistent with other places (like display name). How do you recommend we fix that?

@allgandalf
Copy link
Contributor

Got it. Yeah, ideally we use whatever is consistent with other places (like display name). How do you recommend we fix that?

Use screenwrapper instead of KeyboardAvoidingView, but there must be a reason they added it there, I will open up a discussion on the PR which added that (SWM worked on the implementation so we would surely get a reply to that) will tag you there

@shawnborton
Copy link
Contributor

Sounds good!

@puneetlath
Copy link
Contributor

@Expensify/design someone mind reviewing as well?

@puneetlath
Copy link
Contributor

Oh whoops, my bad. I see @shawnborton already reviewed above.

@truph01
Copy link
Contributor Author

truph01 commented Jul 24, 2024

@puneetlath I addressed your comment above

Copy link
Contributor

@puneetlath puneetlath left a comment

Choose a reason for hiding this comment

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

Sorry a couple more small requests.

import useStyledSafeAreaInsets from './useStyledSafeAreaInsets';
import useThemeStyles from './useThemeStyles';

const useSafePaddingBottomStyle = () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add some general documentation above about what this hook is for.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry for being a stickler, but I'm finding this comment a bit hard to follow. In the future, when should someone use this hook? Maybe if you can just explain that to me in words in a comment here, I can help you craft a code comment that is a bit more clear.

Copy link
Contributor

Choose a reason for hiding this comment

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

agree with you @puneetlath , @truph01 can you please follow up with this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@puneetlath

In the future, when should someone use this hook

This hook, useSafePaddingBottomStyle, is useful for adding extra bottom padding to a component based on the device's safe area. If the device's safe area padding bottom is 0, the hook returns 0. Otherwise, it provides a padding bottom of 20. Use this to ensure content visibility and layout consistency across different devices.

Copy link
Contributor

Choose a reason for hiding this comment

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

That's beautiful. Very clear! Let's make that the comment.

src/components/FormAlertWithSubmitButton.tsx Outdated Show resolved Hide resolved
@truph01
Copy link
Contributor Author

truph01 commented Jul 24, 2024

All comment are resolved

import useStyledSafeAreaInsets from './useStyledSafeAreaInsets';
import useThemeStyles from './useThemeStyles';

const useSafePaddingBottomStyle = () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry for being a stickler, but I'm finding this comment a bit hard to follow. In the future, when should someone use this hook? Maybe if you can just explain that to me in words in a comment here, I can help you craft a code comment that is a bit more clear.

@truph01
Copy link
Contributor Author

truph01 commented Jul 25, 2024

I updated PR @puneetlath

@puneetlath puneetlath merged commit aba404e into Expensify:main Jul 25, 2024
14 checks passed
@OSBotify
Copy link
Contributor

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.0.13-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.13-4 🚀

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

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

Successfully merging this pull request may close these issues.

5 participants