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.

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

Set workspace address when attempting to Book Travel #46333

Merged
merged 34 commits into from
Aug 2, 2024
Merged

Set workspace address when attempting to Book Travel #46333

merged 34 commits into from
Aug 2, 2024

Conversation

rushatgabhane
Copy link
Member

@rushatgabhane rushatgabhane commented Jul 26, 2024 •
edited
Loading

Details

Fixed Issues

$ #46313
$ #43780

PROPOSAL:

Tests

Test 1 : Address check

  1. On account B, create a new workspace and invite account A.
  2. A should not be an admin of the workspace
  3. Go to account A
  4. Make B's workspace as your default workspace!
  5. Green Fab > Book Travel
  6. Verify that company address page opens
  7. Fill an address and save
  8. Click book travel
  9. Verify that you are taken to travelDot

Test 2 : Travel terms and condition

  1. Go to a new account that has not accepted travel terms of condition
  2. Green Fab > Book Travel
  3. QA can skip : Make Travel.acceptSpotnanaTerms() reject the promise.
  4. Verify that when there is an error, travelDot is not opened and you see an error message on terms and condtion.

Test 3 : Open travel

  1. Green Fab > Book Travel
  2. QA can skip : Make Link.openTravelDotLink() reject the promise.
  3. Verify that when there is an error, travelDot is not opened and you see an error message.

Test 4 : Verify that production is opened unless NVP is present

  1. Green Fab > Book Travel
  2. Book travel
  3. Verify that production travelDot is opened
  4. Hardcode NVP.TRAVEL_SETTINGS.testAccount to true
  5. Verify that staging travelDot is opened
  • 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
Screen.Recording.2024-07-30.at.23.57.33.mov
Screen.Recording.2024-07-30.at.23.54.15.mov
Android: mWeb Chrome
iOS: Native
Screen.Recording.2024-07-30.at.23.54.59.mov
Screen.Recording.2024-07-30.at.23.57.19.mov
iOS: mWeb Safari
Screen.Recording.2024-07-30.at.23.58.16.mov
MacOS: Chrome / Safari
Screen.Recording.2024-07-27.at.01.47.12.mov

Accept spotnana

Screen.Recording.2024-07-27.at.14.21.35.mov

Open Travel

Screen.Recording.2024-07-27.at.14.01.00.mov
MacOS: Desktop image

@rushatgabhane rushatgabhane requested a review from a team as a code owner July 26, 2024 22:05
@melvin-bot melvin-bot bot requested review from shubham1206agra and removed request for a team July 26, 2024 22:05
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Jul 26, 2024

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

@rushatgabhane rushatgabhane mentioned this pull request Jul 26, 2024
Closed
6 tasks
@rushatgabhane
Copy link
Member Author

cc @stitesExpensify

@stitesExpensify stitesExpensify self-requested a review July 29, 2024 17:28
@rushatgabhane
Copy link
Member Author

rushatgabhane commented Jul 30, 2024 •
edited
Loading

@shubham1206agra all fixed. Thank you for the review and thorough testing

On safari, when there is an error the browser opens and closes because on safari we HAVE to open the browser in a sync manner. Or it will be blocked. So it is the best we can do and not a bug

d741cff#diff-b517e3500611f44ddf09489a030579e0a63c91d2ccac0ce505c39892911a95a5R27

@rushatgabhane
Copy link
Member Author

Ready for re-review @shubham1206agra @stitesExpensify

@shubham1206agra
Copy link
Contributor

Should we show option here to set the workspace address? I am not super sure about it

yes the linked issue is to allow the user to set a workspace address even if they're non-admin

Than, can you do this. And are we allowed to change the set address?

@rushatgabhane Can you address this?

shubham1206agra
shubham1206agra approved these changes Jul 31, 2024
View reviewed changes
Copy link
Contributor

@shubham1206agra shubham1206agra left a comment

Choose a reason for hiding this comment

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

I am approving this right now. Only one minor thing left. But this is urgent to merge.

@rushatgabhane
Copy link
Member Author

rushatgabhane commented Jul 31, 2024 •
edited
Loading

Can you address this?

it's in issue description. confirmed on slack here:

https://expensify.enterprise.slack.com/archives/C05S5EV2JTX/p1722374168729919

stitesExpensify
stitesExpensify previously approved these changes Aug 1, 2024
View reviewed changes
Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

Looks great! Just one question and then I will merge

src/libs/asyncOpenURL/index.ts Outdated
.then((params) => {
Linking.openURL(typeof url === 'string' ? url : url(params));
})
.catch(() => {});
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we doing nothing when we catch an error?

Copy link
Member Author

@rushatgabhane rushatgabhane Aug 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@stitesExpensify we can log an error for server side

Would this message be helpful?
eg: error occurred while trying to open link: {link}

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah like that!

Copy link
Contributor

Choose a reason for hiding this comment

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

If you update that now I'll get it merged today :D

@rushatgabhane
Copy link
Member Author

@stitesExpensify done

@stitesExpensify stitesExpensify merged commit 69c2987 into Expensify:main Aug 2, 2024
14 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Aug 2, 2024

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

@stitesExpensify stitesExpensify mentioned this pull request Aug 2, 2024
Merged
50 tasks
@dangrous dangrous mentioned this pull request Aug 2, 2024
Open
6 tasks
@github-actions github-actions bot mentioned this pull request Aug 6, 2024
Closed
83 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Aug 6, 2024

🚀 Deployed to staging by https://github.com/stitesExpensify in version: 9.0.17-0 🚀

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

@IuliiaHerets IuliiaHerets mentioned this pull request Aug 7, 2024
Open
6 tasks
@IuliiaHerets
Copy link

This PR is failing because of issue #46971

Bug6564343_1723032067955.1.1.mp4

@melvin-bot melvin-bot bot mentioned this pull request Aug 7, 2024
Closed
@OSBotify
Copy link
Contributor

OSBotify commented Aug 7, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

2 similar comments
@OSBotify
Copy link
Contributor

OSBotify commented Aug 8, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Aug 8, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

rojiphil
rojiphil reviewed Sep 26, 2024
View reviewed changes
src/pages/Travel/ManageTrips.tsx
@@ -49,12 +59,22 @@ function ManageTrips() {
ctaText={translate('travel.bookTravel')}
ctaAccessibilityLabel={translate('travel.bookTravel')}
onCtaPress={() => {
if (!hasPolicyAddress) {
Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(activePolicyID ?? '-1'));
Copy link
Contributor

Choose a reason for hiding this comment

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

Not using backTo while calling getRoute caused #47069

@rojiphil rojiphil mentioned this pull request Sep 26, 2024
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rojiphil rojiphil rojiphil left review comments

@stitesExpensify stitesExpensify stitesExpensify approved these changes

@shubham1206agra shubham1206agra shubham1206agra approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rushatgabhane @shubham1206agra @OSBotify @IuliiaHerets @rojiphil @stitesExpensify