Skip to content

Commit 865f408

Browse files
authored
feat: platform fee + call settings fix (#1011)
1 parent 05f1224 commit 865f408

7 files changed

Lines changed: 32 additions & 10 deletions

File tree

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"access": "public"
1313
},
1414
"dependencies": {
15-
"@dfx.swiss/react": "^1.3.0-beta.255",
16-
"@dfx.swiss/react-components": "^1.3.0-beta.255",
15+
"@dfx.swiss/react": "^1.3.0-beta.256",
16+
"@dfx.swiss/react-components": "^1.3.0-beta.256",
1717
"@ledgerhq/hw-app-btc": "^6.24.1",
1818
"@ledgerhq/hw-app-eth": "^6.33.7",
1919
"@ledgerhq/hw-transport-webhid": "^6.27.19",

src/components/exchange-rate.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export function ExchangeRate({
4646
const bankFee =
4747
type !== TransactionType.SWAP && !bankFixedFee && !bankPercentFee && fees.bank ? `${fees.bank}${feeSymbol}` : false;
4848
const networkStartFee = fees?.networkStart ? `${fees?.networkStart}${feeSymbol}` : undefined;
49+
const platformFee = fees.platform ? `${fees.platform}${feeSymbol}` : undefined;
4950

5051
const l1Replacement =
5152
'blockchain' in to &&
@@ -95,6 +96,12 @@ export function ExchangeRate({
9596
<div>{totalFee}</div>
9697
<div className="text-dfxGray-800">{translate('screens/payment', 'DFX fee')}</div>
9798
<div>{dfxFee}</div>
99+
{platformFee && (
100+
<>
101+
<div className="text-dfxGray-800">{translate('screens/payment', 'Platform fee')}</div>
102+
<div>{platformFee}</div>
103+
</>
104+
)}
98105
{bankFixedFee && (
99106
<>
100107
<div className="text-dfxGray-800">{translate('screens/payment', 'Bank fee (fixed)')}</div>

src/screens/transaction.screen.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,12 @@ export function TxInfo({ tx, showUserDetails }: TxInfoProps): JSX.Element {
10101010
label: translate('screens/payment', 'DFX fee'),
10111011
text: `${tx.fees.dfx} ${tx.inputAsset} (${(tx.fees.rate * 100).toFixed(2)}%)`,
10121012
});
1013+
tx.fees?.platform != null &&
1014+
tx.fees.platform > 0 &&
1015+
rateItems.push({
1016+
label: translate('screens/payment', 'Platform fee'),
1017+
text: `${tx.fees.platform} ${tx.inputAsset}`,
1018+
});
10131019
tx.fees?.network != null &&
10141020
rateItems.push({
10151021
label: translate('screens/payment', 'Network fee'),

src/translations/languages/de.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,11 @@
630630
"Base rate": "Basiskurs",
631631
"Total fee": "Gesamtgebühr",
632632
"DFX fee": "DFX-Gebühr",
633+
"Platform fee": "Plattformgebühr",
633634
"Network fee": "Netzwerkgebühr",
634635
"Bank fee": "Bankgebühr",
636+
"Bank fee (fixed)": "Bankgebühr (fix)",
637+
"Bank fee (percent)": "Bankgebühr (prozentual)",
635638
"Network start fee": "Netzwerk-Startgebühr",
636639

637640
"Your payment has failed. Please try again.": "Deine Zahlung ist fehlgeschlagen. Bitte versuche es erneut.",

src/translations/languages/fr.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,11 @@
630630
"Base rate": "Taux de base",
631631
"Total fee": "Frais totaux",
632632
"DFX fee": "Frais DFX",
633+
"Platform fee": "Frais de plateforme",
633634
"Network fee": "Frais de réseau",
634635
"Bank fee": "Frais bancaires",
636+
"Bank fee (fixed)": "Frais bancaires (fixe)",
637+
"Bank fee (percent)": "Frais bancaires (pourcentage)",
635638
"Network start fee": "Frais de démarrage du réseau",
636639

637640
"Your payment has failed. Please try again.": "Votre paiement a échoué. Veuillez réessayer.",

src/translations/languages/it.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,11 @@
630630
"Base rate": "Tasso base",
631631
"Total fee": "Commissione totale",
632632
"DFX fee": "Commissioni DFX",
633+
"Platform fee": "Commissione piattaforma",
633634
"Network fee": "Commissione di rete",
634635
"Bank fee": "Commissione bancaria",
636+
"Bank fee (fixed)": "Commissione bancaria (fissa)",
637+
"Bank fee (percent)": "Commissione bancaria (percentuale)",
635638
"Network start fee": "Commissione di avvio della rete",
636639

637640
"Your payment has failed. Please try again.": "Il tuo pagamento non è andato a buon fine. Per favore, riprova.",

0 commit comments

Comments
 (0)