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

Use "currency conversion fee" #10002

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Use "currency conversion fee" #10002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e70bd53
Use "currency conversion fee"
aheckler Dec 19, 2024
581bec7
Update test snapshot
Dec 19, 2024
8576d8a
Update changelog
aheckler Dec 19, 2024
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
4 changes: 4 additions & 0 deletions changelog/fix-9996-currency-conversion-fee-phrasing
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Use "currency conversion fee" instead "foreign exchange fee" in payment timeline and various other places.
4 changes: 2 additions & 2 deletions client/payment-details/timeline/map-events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,12 @@ export const feeBreakdown = ( event ) => {
fixedRate !== 0
? __(
/* translators: %1$s% is the fee percentage and %2$s is the fixed rate */
'Foreign exchange fee: %1$s%% + %2$s',
'Currency conversion fee: %1$s%% + %2$s',
'woocommerce-payments'
)
: __(
/* translators: %1$s% is the fee percentage */
'Foreign exchange fee: %1$s%%',
'Currency conversion fee: %1$s%%',
'woocommerce-payments'
),
'additional-wcpay-subscription':
Expand Down
2 changes: 1 addition & 1 deletion client/payment-details/timeline/test/__snapshots__/map-events.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ exports[`mapTimelineEvents single currency events formats captured events with f
International card fee: 1.5%
</li>
<li>
Foreign exchange fee: 2%
Currency conversion fee: 2%
</li>
<li>
Discount
Expand Down
2 changes: 1 addition & 1 deletion client/utils/account-fees.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export const formatMethodFeesTooltip = (
) }
{ hasFees( accountFees.fx ) ? (
<div>
<div>Foreign exchange fee</div>
<div>Currency conversion fee</div>
<div>{ getFeeDescriptionString( accountFees.fx ) }</div>
</div>
) : (
Expand Down
4 changes: 2 additions & 2 deletions client/utils/test/__snapshots__/account-fees.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ exports[`Account fees utility functions formatMethodFeesTooltip() displays base
</div>
<div>
<div>
Foreign exchange fee
Currency conversion fee
</div>
<div>
1%
Expand Down Expand Up @@ -102,7 +102,7 @@ exports[`Account fees utility functions formatMethodFeesTooltip() displays base
</div>
<div>
<div>
Foreign exchange fee
Currency conversion fee
</div>
<div>
1%
Expand Down
4 changes: 2 additions & 2 deletions includes/class-wc-payments-captured-event-note.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,9 @@ private function fee_label_mapping( int $fixed_rate, bool $is_capped ) {

$res['additional-fx'] = 0 !== $fixed_rate
/* translators: %1$s% is the fee percentage and %2$s is the fixed rate */
? __( 'Foreign exchange fee: %1$s%% + %2$s', 'woocommerce-payments' )
? __( 'Currency conversion fee: %1$s%% + %2$s', 'woocommerce-payments' )
/* translators: %1$s% is the fee percentage */
: __( 'Foreign exchange fee: %1$s%%', 'woocommerce-payments' );
: __( 'Currency conversion fee: %1$s%%', 'woocommerce-payments' );

$res['additional-wcpay-subscription'] = 0 !== $fixed_rate
/* translators: %1$s% is the fee percentage and %2$s is the fixed rate */
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/discount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"feeBreakdown": {
"base": "Base fee: 2.9% + $0.30",
"additional-international": "International card fee: 1%",
"additional-fx": "Foreign exchange fee: 1%",
"additional-fx": "Currency conversion fee: 1%",
"discount": {
"label": "Discount",
"variable": "Variable fee: -4.9%",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/foreign-card.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"feeBreakdown": {
"base": "Base fee: 2.9% + $0.30",
"additional-international": "International card fee: 1%",
"additional-fx": "Foreign exchange fee: 1%"
"additional-fx": "Currency conversion fee: 1%"
},
"netString": "Net payout: $95.47 USD"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/fx-decimal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"feeString": "Fee (3.9% + $0.30): -$4.39",
"feeBreakdown": {
"base": "Base fee: 2.9% + $0.30",
"additional-fx": "Foreign exchange fee: 1%"
"additional-fx": "Currency conversion fee: 1%"
},
"netString": "Net payout: $100.65 USD"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/fx-partial-capture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"feeString": "Fee (3.51% + £0.21): -$0.88",
"feeBreakdown": {
"base": "Base fee: 2.9% + $0.30",
"additional-fx": "Foreign exchange fee: 1%",
"additional-fx": "Currency conversion fee: 1%",
"discount": {
"label": "Discount",
"variable": "Variable fee: -0.39%",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/fx-with-capped-fee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"feeBreakdown": {
"base": "Base fee: capped at $6.00",
"additional-international": "International card fee: 1.5%",
"additional-fx": "Foreign exchange fee: 1%"
"additional-fx": "Currency conversion fee: 1%"
},
"netString": "Net payout: $971.04 USD"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/fx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"feeString": "Fee (3.9% + $0.30): -$4.20",
"feeBreakdown": {
"base": "Base fee: 2.9% + $0.30",
"additional-fx": "Foreign exchange fee: 1%"
"additional-fx": "Currency conversion fee: 1%"
},
"netString": "Net payout: $95.84 USD"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/jpy-payment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"feeBreakdown": {
"base": "Base fee: 3.6%",
"additional-international": "International card fee: 2%",
"additional-fx": "Foreign exchange fee: 2%"
"additional-fx": "Currency conversion fee: 2%"
},
"netString": "Net payout: ¥4,507 JPY"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/captured-payments/subscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"feeString": "Fee (4.9% + $0.30): -$3.04",
"feeBreakdown": {
"base": "Base fee: 2.9% + $0.30",
"additional-fx": "Foreign exchange fee: 1%",
"additional-fx": "Currency conversion fee: 1%",
"additional-wcpay-subscription": "Subscription transaction fee: 1%"
},
"netString": "Net payout: $52.87 USD"
Expand Down
Loading