[VIP][Travel] Open travelDot after accepting terms and conditions #43966

rushatgabhane · 2024-06-18T22:12:48Z

Details

Fixed Issues

$ #43867
PROPOSAL: https://expensify.slack.com/archives/C05S5EV2JTX/p1718718276561529?thread_ts=1718697839.930099&cid=C05S5EV2JTX

Tests

Pre-requisite: Account should be on travel beta.

Travel terms of service not accepted by the account

Go to an account that hasn't accepted travel Terms of Service (ToS) before.
Open global + > Book travel
Click book travel.
Verify that you're shown (ToS) page.
Accept the ToS and click next.
Verify that you're redirected to travelDot.

Travel terms of service previously accepted by the account

Go to an account that has accepted the above mentioned ToS.
Open global + > Book travel
Click book travel.
Verify that you're not shown the ToS page.
Verify that you're redirected to travelDot.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-06-19.at.02.44.27.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-06-19.at.03.00.41.mov

iOS: mWeb Safari

Screen.Recording.2024-06-19.at.03.03.18.mov

Screen.Recording.2024-06-19.at.03.02.42.mov

MacOS: Chrome / Safari

ToS Not accepted

Screen.Recording.2024-06-19.at.01.36.58.mov

ToS accepted

Screen.Recording.2024-06-19.at.01.38.06.mov

MacOS: Desktop

Screen.Recording.2024-06-19.at.03.09.42.mov

rushatgabhane · 2024-06-18T22:18:28Z

src/libs/actions/Travel.ts

+        // eslint-disable-next-line rulesdir/no-api-side-effects-method
+        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.ACCEPT_SPOTNANA_TERMS, {}, {optimisticData})
+            .then((response) => (response?.spotnanaToken ? buildTravelDotURL(response.spotnanaToken) : buildTravelDotURL()))
+            .catch(() => buildTravelDotURL()),


All error handling will be done in #43780

Right now it'll error on spotnana side.

melvin-bot · 2024-06-18T22:40:07Z

@jayeshmangwani 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 · 2024-06-18T22:48:18Z

cc @stitesExpensify @danieldoglas : )

jayeshmangwani · 2024-06-19T06:21:47Z

Not sure if it needs a C+ review. Please let me know if it does.

twisterdotcom · 2024-06-19T14:50:03Z

Gonna assign @shubham1206agra here if that's okay @jayeshmangwani as he has a lot more context on travel. Also @danieldoglas too for an internal review.

rushatgabhane · 2024-06-20T00:44:15Z

The TS error is from main. Kindly ignore it

shubham1206agra · 2024-06-20T11:55:16Z

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

Android: mWeb Chrome

Screen.Recording.2024-06-20.at.4.56.59.PM.mov

iOS: Native

Screen.Recording.2024-06-20.at.5.22.19.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-06-20.at.4.50.38.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-20.at.4.34.15.PM.mov

MacOS: Desktop

Screen.Recording.2024-06-20.at.5.05.49.PM.mov

rushatgabhane · 2024-06-23T23:43:50Z

@danieldoglas this can be merged if it looks good to you

OSBotify · 2024-06-25T18:32:56Z

✋ 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 · 2024-06-25T20:09:34Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.0.2-0 🚀

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

OSBotify · 2024-07-03T19:38:48Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.3-7 🚀

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

OSBotify · 2024-07-10T10:57:11Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

rushatgabhane added 10 commits June 19, 2024 00:51

rm travel settings from account

24bdedb

add nvp travel settings type

8ed9bf5

use optimistic data

cb13ff9

export build travel dot url

2f40562

add nvp travel settings

9347e2c

convert to make req with side effects

19be39a

fix imports

dee12dd

make accept spotnana api req with sideeffects and navigate to travel dot

48fc055

show travel tos only if not accepted already

eadd97b

Merge branch 'main' of github.com:rushatgabhane/exfy into traveldot

571713a

rushatgabhane mentioned this pull request Jun 18, 2024

[HOLD for payment 2024-07-10] [$500] [CRITICAL] Open travelDot after accepting terms and conditions #43867

Closed

rushatgabhane commented Jun 18, 2024

View reviewed changes

test: rm travel settings from account in test

cd516c9

rushatgabhane marked this pull request as ready for review June 18, 2024 22:40

rushatgabhane requested a review from a team as a code owner June 18, 2024 22:40

melvin-bot bot requested review from jayeshmangwani and removed request for a team June 18, 2024 22:40

twisterdotcom requested review from danieldoglas and shubham1206agra and removed request for jayeshmangwani June 19, 2024 14:49

Merge branch 'main' into traveldot

3970ad5

rushatgabhane added 2 commits June 20, 2024 03:49

Merge branch 'Expensify:main' into traveldot

aa26c7e

Merge branch 'Expensify:main' into traveldot

4060e5e

shubham1206agra approved these changes Jun 20, 2024

View reviewed changes

rushatgabhane added 4 commits June 20, 2024 15:09

Merge branch 'Expensify:main' into traveldot

ebe0edb

Merge branch 'Expensify:main' into traveldot

d97e734

Merge branch 'Expensify:main' into traveldot

c1c69f7

Merge branch 'main' into traveldot

beb9744

danieldoglas approved these changes Jun 25, 2024

View reviewed changes

danieldoglas merged commit 1b87b13 into Expensify:main Jun 25, 2024
14 checks passed

github-actions bot mentioned this pull request Jun 25, 2024

Deploy Checklist: New Expensify 2024-06-25 #44406

Closed

92 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[VIP][Travel] Open travelDot after accepting terms and conditions #43966

[VIP][Travel] Open travelDot after accepting terms and conditions #43966

rushatgabhane commented Jun 18, 2024 •

edited

Loading

rushatgabhane Jun 18, 2024 •

edited

Loading

melvin-bot bot commented Jun 18, 2024

rushatgabhane commented Jun 18, 2024

jayeshmangwani commented Jun 19, 2024

twisterdotcom commented Jun 19, 2024

rushatgabhane commented Jun 20, 2024

shubham1206agra commented Jun 20, 2024

rushatgabhane commented Jun 23, 2024

OSBotify commented Jun 25, 2024

OSBotify commented Jun 25, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024

[VIP][Travel] Open travelDot after accepting terms and conditions #43966

[VIP][Travel] Open travelDot after accepting terms and conditions #43966

Conversation

rushatgabhane commented Jun 18, 2024 • edited Loading

Details

Fixed Issues

Tests

Travel terms of service not accepted by the account

Travel terms of service previously accepted by the account

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

ToS Not accepted

ToS accepted

rushatgabhane Jun 18, 2024 • edited Loading

Choose a reason for hiding this comment

melvin-bot bot commented Jun 18, 2024

rushatgabhane commented Jun 18, 2024

jayeshmangwani commented Jun 19, 2024

twisterdotcom commented Jun 19, 2024

rushatgabhane commented Jun 20, 2024

shubham1206agra commented Jun 20, 2024

Reviewer Checklist

Screenshots/Videos

rushatgabhane commented Jun 23, 2024

OSBotify commented Jun 25, 2024

OSBotify commented Jun 25, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024

rushatgabhane commented Jun 18, 2024 •

edited

Loading

rushatgabhane Jun 18, 2024 •

edited

Loading