Skip to content

Don't ask for workspace address if public domain user can't enable Travel #57785

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

Merged
MarioExpensify merged 2 commits into from
Mar 6, 2025
Merged

Don't ask for workspace address if public domain user can't enable Travel #57785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
942b8de
Don't ask for workspace address if public domain user can't enable Tr…
cristipaval Mar 4, 2025
f6240c7
Revert submodule Mobile-Expensify to f5a32c
cristipaval Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/components/BookTravelButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ function BookTravelButton({text}: BookTravelButtonProps) {
return;
}

// Spotnana requires an address anytime an entity is created for a policy
if (isEmptyObject(policy?.address)) {
Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_ADDRESS.getRoute(policy?.id, Navigation.getActiveRoute()));
return;
}

const isPolicyProvisioned = policy?.travelSettings?.spotnanaCompanyID ?? policy?.travelSettings?.associatedTravelDomainAccountID;
if (policy?.travelSettings?.hasAcceptedTerms ?? (travelSettings?.hasAcceptedTerms && isPolicyProvisioned)) {
openTravelDotLink(policy?.id)
Expand Down Expand Up @@ -91,6 +85,9 @@ function BookTravelButton({text}: BookTravelButtonProps) {
const adminDomains = getAdminsPrivateEmailDomains(policy);
if (adminDomains.length === 0) {
Navigation.navigate(ROUTES.TRAVEL_PUBLIC_DOMAIN_ERROR);
} else if (isEmptyObject(policy?.address)) {
// Spotnana requires an address anytime an entity is created for a policy
Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_ADDRESS.getRoute(policy?.id, Navigation.getActiveRoute()));
Comment on lines +88 to +90

@parasharrajat parasharrajat Mar 5, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We were earlier asking to address before accepting terms. But now, if the policy is provisioned, it will take the user to the accept terms page. I tried to dig in about policy provisioning but could not find anything, and it is unclear whether we should be asking for an address before terms. Will user always go through address step now before accepting terms? @cristipaval In other terms,

} else if (isPolicyProvisioned) {
            navigateToAcceptTerms(CONST.TRAVEL.DEFAULT_DOMAIN);
        }

Will always be true after address step is done?

@cristipaval cristipaval Mar 5, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

A policy can't be provisioned without an address, so if isPolicyProvisioned is true, then the address is not required anymore. There was an address set for the policy when Travel was provisioned for it.

} else if (adminDomains.length === 1) {
navigateToAcceptTerms(adminDomains.at(0) ?? CONST.TRAVEL.DEFAULT_DOMAIN);
} else {
Expand Down