[Wave Collect] [Workflows] Display meaningful message when currency is not available for Direct Reimbursement #38318
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,6 +129,14 @@ type WorkspaceMembersRoleData = { | |
| role: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER; | ||
| }; | ||
|
|
||
| const CURRENCY_AU = 'AUD'; | ||
| const CURRENCY_CA = 'CAD'; | ||
| const CURRENCY_GB = 'GBP'; | ||
| const CURRENCY_US = 'USD'; | ||
| const CURRENCY_EUR = 'EUR'; | ||
|
|
||
| const DIRECT_REIMBURSEMENT_CURRENCIES: string[] = [CURRENCY_AU, CURRENCY_CA, CURRENCY_EUR, CURRENCY_GB, CURRENCY_US]; | ||
|
|
||
|
There was a problem hiding this comment. We already have these defined here, it also seems like we support NZD, which is missing in your list above There was a problem hiding this comment. +1 definitely lets reuse this from Const or add there what is missing there |
||
| const allPolicies: OnyxCollection<Policy> = {}; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.COLLECTION.POLICY, | ||
|
|
@@ -249,6 +257,9 @@ function updateLastAccessedWorkspace(policyID: OnyxEntry<string>) { | |
| Onyx.set(ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID, policyID); | ||
| } | ||
|
|
||
| function hasValidCurrencyForDirectReimbursement(currency: string) { | ||
lakchote marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return DIRECT_REIMBURSEMENT_CURRENCIES.includes(currency); | ||
| } | ||
| /** | ||
| * Check if the user has any active free policies (aka workspaces) | ||
| */ | ||
|
|
@@ -466,6 +477,7 @@ function setWorkspaceAutoReporting(policyID: string, enabled: boolean, frequency | |
| }, | ||
| autoReportingFrequency: policy.autoReportingFrequency ?? null, | ||
| pendingFields: {isAutoApprovalEnabled: null, harvesting: null}, | ||
| errorFields: {autoReporting: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.autoReportingErrorMessage')}, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
@@ -506,6 +518,7 @@ function setWorkspaceAutoReportingFrequency(policyID: string, frequency: ValueOf | |
| value: { | ||
| autoReportingFrequency: policy.autoReportingFrequency ?? null, | ||
| pendingFields: {autoReportingFrequency: null}, | ||
| errorFields: {autoReportingFrequency: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.autoReportingFrequencyErrorMessage')}, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
@@ -546,6 +559,7 @@ function setWorkspaceAutoReportingMonthlyOffset(policyID: string, autoReportingO | |
| value: { | ||
| autoReportingOffset: policy.autoReportingOffset ?? null, | ||
| pendingFields: {autoReportingOffset: null}, | ||
| errorFields: {autoReportingOffset: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.monthlyOffsetErrorMessage')}, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
@@ -594,6 +608,7 @@ function setWorkspaceApprovalMode(policyID: string, approver: string, approvalMo | |
| approvalMode: policy.approvalMode ?? null, | ||
| isAutoApprovalEnabled: policy.isAutoApprovalEnabled ?? null, | ||
| pendingFields: {approvalMode: null}, | ||
| errorFields: {approvalMode: ErrorUtils.getMicroSecondOnyxError('workflowsApprovalPage.genericErrorMessage')}, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
@@ -657,6 +672,26 @@ function setWorkspacePayer(policyID: string, reimburserEmail: string, reimburser | |
| API.write(WRITE_COMMANDS.SET_WORKSPACE_PAYER, params, {optimisticData, failureData, successData}); | ||
| } | ||
|
|
||
| function clearWorkspaceAutoReportingError(policyID: string) { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {autoReporting: null}}); | ||
| } | ||
|
|
||
| function clearWorkspaceAutoReportingFrequencyError(policyID: string) { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {autoReportingFrequency: null}}); | ||
| } | ||
|
|
||
| function clearWorkspaceGeneralSettingError(policyID: string) { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {generalSettings: null}}); | ||
| } | ||
|
|
||
| function clearWorkspaceAutoReportingOffsetError(policyID: string) { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {autoReportingOffset: null}}); | ||
| } | ||
|
|
||
| function clearWorkspaceApprovalError(policyID: string) { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {approvalMode: null}}); | ||
| } | ||
|
|
||
lakchote marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| function clearWorkspacePayerError(policyID: string) { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {reimburserEmail: null}}); | ||
| } | ||
|
|
@@ -1358,6 +1393,7 @@ function updateGeneralSettings(policyID: string, name: string, currency: string) | |
| }, | ||
| }, | ||
| ]; | ||
|
|
||
| const failureData: OnyxUpdate[] = [ | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
|
|
@@ -3908,4 +3944,10 @@ export { | |
| clearWorkspaceReimbursementErrors, | ||
| deleteWorkspaceCategories, | ||
| setWorkspaceTagEnabled, | ||
| clearWorkspaceApprovalError, | ||
| clearWorkspaceAutoReportingError, | ||
| clearWorkspaceAutoReportingFrequencyError, | ||
| clearWorkspaceAutoReportingOffsetError, | ||
| clearWorkspaceGeneralSettingError, | ||
| hasValidCurrencyForDirectReimbursement, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has marketing reviewed these copies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Asked about it here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lakchote This is usually done using Marketing label autoassigner on the linked issue so we get one dedicated person for this