Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"access": "public"
},
"dependencies": {
"@dfx.swiss/react": "^1.3.0-beta.255",
"@dfx.swiss/react-components": "^1.3.0-beta.255",
"@dfx.swiss/react": "^1.3.0-beta.256",
"@dfx.swiss/react-components": "^1.3.0-beta.256",
"@ledgerhq/hw-app-btc": "^6.24.1",
"@ledgerhq/hw-app-eth": "^6.33.7",
"@ledgerhq/hw-transport-webhid": "^6.27.19",
Expand Down
7 changes: 7 additions & 0 deletions src/components/exchange-rate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export function ExchangeRate({
const bankFee =
type !== TransactionType.SWAP && !bankFixedFee && !bankPercentFee && fees.bank ? `${fees.bank}${feeSymbol}` : false;
const networkStartFee = fees?.networkStart ? `${fees?.networkStart}${feeSymbol}` : undefined;
const platformFee = fees.platform ? `${fees.platform}${feeSymbol}` : undefined;

const l1Replacement =
'blockchain' in to &&
Expand Down Expand Up @@ -95,6 +96,12 @@ export function ExchangeRate({
<div>{totalFee}</div>
<div className="text-dfxGray-800">{translate('screens/payment', 'DFX fee')}</div>
<div>{dfxFee}</div>
{platformFee && (
<>
<div className="text-dfxGray-800">{translate('screens/payment', 'Platform fee')}</div>
<div>{platformFee}</div>
</>
)}
{bankFixedFee && (
<>
<div className="text-dfxGray-800">{translate('screens/payment', 'Bank fee (fixed)')}</div>
Expand Down
6 changes: 6 additions & 0 deletions src/screens/transaction.screen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,12 @@ export function TxInfo({ tx, showUserDetails }: TxInfoProps): JSX.Element {
label: translate('screens/payment', 'DFX fee'),
text: `${tx.fees.dfx} ${tx.inputAsset} (${(tx.fees.rate * 100).toFixed(2)}%)`,
});
tx.fees?.platform != null &&
tx.fees.platform > 0 &&
rateItems.push({
label: translate('screens/payment', 'Platform fee'),
text: `${tx.fees.platform} ${tx.inputAsset}`,
});
tx.fees?.network != null &&
rateItems.push({
label: translate('screens/payment', 'Network fee'),
Expand Down
3 changes: 3 additions & 0 deletions src/translations/languages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,11 @@
"Base rate": "Basiskurs",
"Total fee": "Gesamtgebühr",
"DFX fee": "DFX-Gebühr",
"Platform fee": "Plattformgebühr",
"Network fee": "Netzwerkgebühr",
"Bank fee": "Bankgebühr",
"Bank fee (fixed)": "Bankgebühr (fix)",
"Bank fee (percent)": "Bankgebühr (prozentual)",
"Network start fee": "Netzwerk-Startgebühr",

"Your payment has failed. Please try again.": "Deine Zahlung ist fehlgeschlagen. Bitte versuche es erneut.",
Expand Down
3 changes: 3 additions & 0 deletions src/translations/languages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,11 @@
"Base rate": "Taux de base",
"Total fee": "Frais totaux",
"DFX fee": "Frais DFX",
"Platform fee": "Frais de plateforme",
"Network fee": "Frais de réseau",
"Bank fee": "Frais bancaires",
"Bank fee (fixed)": "Frais bancaires (fixe)",
"Bank fee (percent)": "Frais bancaires (pourcentage)",
"Network start fee": "Frais de démarrage du réseau",

"Your payment has failed. Please try again.": "Votre paiement a échoué. Veuillez réessayer.",
Expand Down
3 changes: 3 additions & 0 deletions src/translations/languages/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,11 @@
"Base rate": "Tasso base",
"Total fee": "Commissione totale",
"DFX fee": "Commissioni DFX",
"Platform fee": "Commissione piattaforma",
"Network fee": "Commissione di rete",
"Bank fee": "Commissione bancaria",
"Bank fee (fixed)": "Commissione bancaria (fissa)",
"Bank fee (percent)": "Commissione bancaria (percentuale)",
"Network start fee": "Commissione di avvio della rete",

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