-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Show correct currency when selecting linked feeds #93331
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
03c648b
Rename function and add comment to explain versitility
rafecolton 122c7f5
Refactor useCurrencyForExpensifyCard hook to incorporate fundID
rafecolton b8d6bd3
Use renamed functions, pass fundID where applicable
rafecolton 33b173f
Use a less-overhead method to determine which disclaimer to show
rafecolton 7bd76e1
Add fundID to assignee step to show correct currency there too
rafecolton eadba48
Merge remote-tracking branch 'origin/main' into linked-card-feed-curr…
rafecolton c6be59d
Spellcheck
rafecolton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -1,9 +1,26 @@ | ||
| import {getCardOrFeedCurrency} from '@libs/CardUtils'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import useExpensifyCardUkEuSupported from './useExpensifyCardUkEuSupported'; | ||
| import useOnyx from './useOnyx'; | ||
| import usePolicy from './usePolicy'; | ||
|
|
||
| export default function useCurrencyForExpensifyCard({policyID}: {policyID?: string}) { | ||
| export default function useCurrencyForExpensifyCard({policyID, fundID}: {policyID?: string; fundID?: number}) { | ||
| const policy = usePolicy(policyID); | ||
| const isUkEuCurrencySupported = useExpensifyCardUkEuSupported(policyID); | ||
| return isUkEuCurrencySupported ? (policy?.outputCurrency ?? CONST.CURRENCY.USD) : CONST.CURRENCY.USD; | ||
| const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${fundID}`); | ||
|
|
||
| // The selected feed can belong to a different policy/domain than the one being viewed | ||
| // (e.g. a US feed linked to a GBP policy), so derive the currency from the feed itself. | ||
| if (fundID && cardSettings) { | ||
| return getCardOrFeedCurrency(undefined, cardSettings); | ||
| } | ||
|
|
||
| // If no fund was provided, then use the policy currency, if available | ||
| if (isUkEuCurrencySupported && policy?.outputCurrency) { | ||
| return policy.outputCurrency; | ||
| } | ||
|
|
||
| // Finally, fall back to USD | ||
| return CONST.CURRENCY.USD; | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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.
When a GBP/EUR workspace's selected feed settings have loaded but don't include the optional
currencyfield (for example legacy/nestedGBsettings), this branch returnsgetCardOrFeedCurrency(undefined, cardSettings). With no card, that helper has nofeedCountry, so after failing to findsettings.currencyit falls through to USD instead of the previouspolicy.outputCurrency; the list and issue-card flow will display and store USD for that GBP/EUR feed. Please fall back to the policy currency or infer the program from settings when the feed settings don't carry a currency.Useful? React with 👍 / 👎.
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.
AFAIK this is not a real thing, there are no "legacy" GB settings, the program hasn't even launched yet