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: iOS - Distance - Center icon overlaps with compass icon. #44752

Merged
merged 6 commits into from
Jul 17, 2024

Conversation

Krishna2323
Copy link
Contributor

@Krishna2323 Krishna2323 commented Jul 2, 2024

Details

Fixed Issues

$ #44486
PROPOSAL: #44486 (comment)

Tests

  • Android Native:
  1. Go to FAB > Submit expense > Distance
  2. Verify compass is shown and there is no scale bar
  3. Use two fingers to rotate the map
  4. Verify the compass rotates
  • iOS Native:
  1. Go to FAB > Submit expense > Distance
  2. Verify scale bar is not displayed
  3. Use two fingers to rotate the map
  4. Verify the compass is displayed and rotates
  • Web/mWeb/Desktop
  1. Go to FAB > Submit expense > Distance
  2. Verify compass and scale bar is not shown
  • Verify that no errors appear in the JS console

Offline tests

  • Android Native:
  1. Go to FAB > Submit expense > Distance
  2. Verify compass is shown
  3. Use two fingers to rotate the map
  4. Verify the compass rotates
  • iOS Native:
  1. Go to FAB > Submit expense > Distance
  2. Verify scale bar is not displayed
  3. Use two fingers to rotate the map
  4. Verify the compass is displayed and rotates
  • Web/mWeb/Desktop
  1. Go to FAB > Submit expense > Distance
  2. Verify compass and scale bar is not shown

QA Steps

  • Android Native:
  1. Go to FAB > Submit expense > Distance
  2. Verify compass is shown
  3. Use two fingers to rotate the map
  4. Verify the compass rotates
  • iOS Native:
  1. Go to FAB > Submit expense > Distance
  2. Verify scale bar is not displayed
  3. Use two fingers to rotate the map
  4. Verify the compass is displayed and rotates
  • Web/mWeb/Desktop
  1. Go to FAB > Submit expense > Distance
  2. Verify compass and scale bar is not shown
  • 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
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 requested review from a team as code owners July 2, 2024 23:33
@melvin-bot melvin-bot bot removed the request for review from a team July 2, 2024 23:33
Copy link

melvin-bot bot commented Jul 2, 2024

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

@melvin-bot melvin-bot bot requested a review from ahmedGaber93 July 2, 2024 23:33
@Krishna2323
Copy link
Contributor Author

@Expensify/design, there were few inconsistency in android and iOS native.

  1. Scale bar was shown in iOS but now on android.
  2. Compass was shown when rotating on iOS but not on android.

The scale bar is now correctly shown on both, but on iOS, the compass only appears after rotating, while on Android, it is already present when the map initially loads. Pls let me know if thats fine or not.

Android

android_native.mp4

iOS

ios_native.mp4

@dubielzyk-expensify
Copy link
Contributor

I saw the original issue, but I still think we should hide the scale bar by default. Not sure what value it adds in our app. Keen on @Expensify/design thoughts here.

iOS looks great, but it is possible to only show compass once the map is rotated for Android as well?

@shawnborton
Copy link
Contributor

That makes sense to me, I'm down to always hide the scale bar. And I agree that the hide/show behavior for the compass should be consistent everywhere.

@dannymcclain
Copy link
Contributor

Agree! Down for consistent show/hide compass behavior and never showing the scale bar.

@ahmedGaber93
Copy link
Contributor

@Krishna2323 what changes do you think we need to hide compass/scalebar by default and appear it when rotate/scale only?

@Krishna2323
Copy link
Contributor Author

@ahmedGaber93, I'm no sure how to hide scale bar on ios because it was displayed even when scaleBarEnabled was false though I will check for solutions very soon. One solution in mind is adding negative positions to scale bar so it gets out out the view.

@ahmedGaber93
Copy link
Contributor

@Krishna2323 What is the updates here #44752 (comment)?

@Krishna2323
Copy link
Contributor Author

Sorry for the delay :( I upgraded my Mac and have been trying to set up the project since yesterday. I'm still not able to run the Android and iOS simulators. This is my priority, and I will update you as soon as I'm able to test.

@Krishna2323
Copy link
Contributor Author

@ahmedGaber93, I have spent a fair amount of time finding a solution for hiding the scale bar and making the compass behavior consistent, but I haven't found any straightforward solution. The compassEnabled and scaleBarEnabled properties only work on Android native and have no effect on iOS. However, we can remove the scale bar on iOS by setting the scaleBarPosition top value to a negative value so it gets out of the map view container. Please let me know what you think.

map_compass_issue.mp4

@ahmedGaber93
Copy link
Contributor

ahmedGaber93 commented Jul 10, 2024

but I haven't found any straightforward solution. The compassEnabled and scaleBarEnabled properties only work on Android native and have no effect on iOS.

@Krishna2323 Hiding the scale bar solution seem good for me. The problem now is the compass behavior is inconsistent in android and iOS, and I think this comes from the Mapbox library itself.

@Expensify/design we think inconsistent in the compass behavior comes from the Mapbox library itself, and we can't find a solution for it right now, we can keep iOS behavior and hide compass in android like the current, also we can show it all time otherwise map is rotated or not in android. What do you think?

@Krishna2323
Copy link
Contributor Author

Krishna2323 commented Jul 10, 2024

Alternatively, we can also hide the compass on Android using compassEnabled prop and on iOS we can hide it by using compassPosition prop.

@dubielzyk-expensify
Copy link
Contributor

we think inconsistent in the compass behavior comes from the Mapbox library itself

Yeah it looks like that to me too.

I think what's in this comment looks good to me. I'd prefer that the compass wasn't showing on Android until you rotated the map like on iOS, but if that isn't doable, then I guess that's a Mapbox thing and hopefully they'll fix that at some point.

@ahmedGaber93
Copy link
Contributor

@dubielzyk-expensify Just for confirmation the current behavior now is disabling compass in android, what we should do in this PR?

  1. keep it disabled on android
  2. enable it on android, but it will visible all times even if map not rotate

@dubielzyk-expensify
Copy link
Contributor

If we remove it, you can't reset the rotation if we've hidden the compass right?

@ahmedGaber93
Copy link
Contributor

If we remove it, you can't reset the rotation if we've hidden the compass right?

Yes, this is correct. User will can't reset the rotation, but he can rotate back using two fingers

@shawnborton
Copy link
Contributor

I tend to agree with @dubielzyk-expensify here - I think what's shown here is probably the best compromise for now?

@dannymcclain
Copy link
Contributor

I tend to agree with @dubielzyk-expensify here - I think what's shown #44752 (comment) is probably the best compromise for now?

Yeah I think so too. Its unfortunate that mapbox has it working differently on different platform, but honestly it's not the end of the world and I think we should just roll it.

@ahmedGaber93
Copy link
Contributor

@Krishna2323 Bump to update code to match your video here #44752 (comment)

@Krishna2323
Copy link
Contributor Author

Krishna2323 commented Jul 13, 2024

@ahmedGaber93, build is failing for android/ios native, I'm trying to fix that and will update as soon as it gets fixed. Can you pls check and let me know if you are able to build the app for android/ios native?

Monosnap PopoverMenu tsx — App 2024-07-13 13-37-32

@ahmedGaber93
Copy link
Contributor

Can you pls check and let me know if you are able to build the app for android/ios native?

@Krishna2323 yes, it builds without errors with me. Your screenshot not display the full error you faced, you can share the complete error in expensifiy-open-source with other and get help

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323
Copy link
Contributor Author

@ahmedGaber93, code updated.

@ahmedGaber93
Copy link
Contributor

ahmedGaber93 commented Jul 16, 2024

@Krishna2323 Can you update Tests step with expected behavior for android and iOS and other platforms separately

@ahmedGaber93
Copy link
Contributor

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
a.mp4
Android: mWeb Chrome
aw.mp4
iOS: Native
i.mp4
iOS: mWeb Safari
iw.mp4
MacOS: Chrome / Safari
w.mp4
MacOS: Desktop
d.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323
Copy link
Contributor Author

Test steps updated

Copy link
Contributor

@ahmedGaber93 ahmedGaber93 left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from lakchote July 17, 2024 03:48
Copy link
Contributor

@dubielzyk-expensify dubielzyk-expensify left a comment

Choose a reason for hiding this comment

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

LGTM from a design perspective

@lakchote lakchote merged commit 9c509a0 into Expensify:main Jul 17, 2024
18 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/lakchote in version: 9.0.9-1 🚀

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

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.9-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.9-5 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.10-7 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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.

7 participants