Skip to content

Commit

Permalink
Use "currency conversion fee" (#10002)
Browse files Browse the repository at this point in the history
Co-authored-by: Nagesh Pai <[email protected]>
  • Loading branch information
aheckler and Nagesh Pai authored Dec 19, 2024
1 parent 7b22325 commit 863519d
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 16 deletions.
4 changes: 4 additions & 0 deletions changelog/fix-9996-currency-conversion-fee-phrasing
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 863519d

Please sign in to comment.