Skip to content

Commit 3741fae

Browse files
fix the missing improvements from issue 1896
1 parent 60f7ddf commit 3741fae

24 files changed

Lines changed: 33 additions & 107 deletions

lib/features/transactions/ui/widgets/transaction_details_table.dart

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ class TransactionDetailsTable extends StatelessWidget {
180180
if (swap == null) ...[
181181
if (txId != null)
182182
DetailsTableItem(
183-
label: context.loc.transactionDetailLabelTransactionId,
183+
label: isLiquid
184+
? context.loc.transactionDetailLabelLiquidTxId
185+
: context.loc.transactionDetailLabelBitcoinTxId,
184186
displayValue: StringFormatting.truncateMiddle(txId),
185187
copyValue: txId,
186188
displayWidget: _mempoolLink(
@@ -241,7 +243,7 @@ class TransactionDetailsTable extends StatelessWidget {
241243
transaction?.isIncoming == true
242244
? amountReceived
243245
: amountSent,
244-
).toUpperCase()
246+
)
245247
: FormatAmount.btc(
246248
ConvertAmount.satsToBtc(
247249
transaction?.isIncoming == true
@@ -255,7 +257,7 @@ class TransactionDetailsTable extends StatelessWidget {
255257
DetailsTableItem(
256258
label: context.loc.transactionDetailLabelAmountReceived,
257259
displayValue: bitcoinUnit == BitcoinUnit.sats
258-
? FormatAmount.sats(amountReceived).toUpperCase()
260+
? FormatAmount.sats(amountReceived)
259261
: FormatAmount.btc(
260262
ConvertAmount.satsToBtc(amountReceived),
261263
).toUpperCase(),
@@ -264,7 +266,7 @@ class TransactionDetailsTable extends StatelessWidget {
264266
DetailsTableItem(
265267
label: context.loc.transactionDetailLabelTransactionFee,
266268
displayValue: bitcoinUnit == BitcoinUnit.sats
267-
? FormatAmount.sats(txFee ?? 0).toUpperCase()
269+
? FormatAmount.sats(txFee ?? 0)
268270
: FormatAmount.btc(
269271
ConvertAmount.satsToBtc(txFee ?? 0),
270272
).toUpperCase(),
@@ -377,7 +379,7 @@ class TransactionDetailsTable extends StatelessWidget {
377379
DetailsTableItem(
378380
label: context.loc.transactionDetailLabelPayinAmount,
379381
displayValue: bitcoinUnit == BitcoinUnit.sats
380-
? FormatAmount.sats(payinAmountSat).toUpperCase()
382+
? FormatAmount.sats(payinAmountSat)
381383
: FormatAmount.btc(
382384
ConvertAmount.satsToBtc(payinAmountSat),
383385
).toUpperCase(),

localization/app_ar.arb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5628,10 +5628,6 @@
56285628
"@fundExchangeWarningDescription": {
56295629
"description": "Warning message about potential scammers when funding account"
56305630
},
5631-
"transactionDetailLabelTransactionId": "هوية المعاملات",
5632-
"@transactionDetailLabelTransactionId": {
5633-
"description": "Label for transaction ID in details"
5634-
},
56355631
"arkReceiveTitle": "Ark Receive",
56365632
"@arkReceiveTitle": {
56375633
"description": "AppBar title for Ark receive screen"

localization/app_as.arb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"legacyStorageRiskAckButtonHasBackup": "মই বিপদটো বুজি পাইছোঁ",
171171
"walletSetupErrorTryAgain": "Something went wrong setting up your wallet. Please try again.",
172172
"transactionSwapOpenWithin24Hours": "২৪ ঘণ্টার মধ্যে আপনার অ্যাপ খুলে আপনার সোয়াপ সম্পন্ন করুন।",
173-
"appStartupErrorMessage": "অ্যাপ চালু হতে ব্যর্থ হয়েছে। অ্যাপ সম্পূর্ণভাবে বন্ধ করে পুনরায় চালু করার চেষ্টা করুন। যদি সমস্যা থেকে যায়, সাপোর্টের সাথে যোগাযোগ করুন এবং আপনার লগ শেয়ার করুন।",
173+
"appStartupErrorMessage": "এপটো আৰম্ভ হ'বলৈ বিফল হৈছে। এপটো সম্পূৰ্ণৰূপে বন্ধ কৰি পুনৰ আৰম্ভ কৰক। সমস্যাটো অব্যাহত থাকিলে, সহায়লৈ প্ৰতিবেদন দিয়ক আৰু আপোনাৰ লগ শ্বেয়াৰ কৰক।",
174174
"importMnemonicDuplicateError": "এই নেমনিক ইতিমধ্যে বিদ্যমান",
175175
"translationWarningTitle": "AI-দ্বাৰা উৎপাদিত অনুবাদ",
176176
"translationWarningDescription": "এই এপ্পৰ অধিকাংশ অনুবাদ AI ব্যৱহাৰ কৰি তৈয়াৰ কৰা হৈছে আৰু ইয়াত ভুল থাকিব পাৰে। যদি আপুনি কোনো ভুল লক্ষ্য কৰে বা অনুবাদ উন্নত কৰাত সহায় কৰিব বিচাৰে, তেন্তে আমাৰ সমাজ অনুবাদ প্লেটফৰ্মৰ জৰিয়তে অৱদান দিব পাৰে।",
@@ -1069,7 +1069,6 @@
10691069
"transactionOrderLabelOriginName": "উৎসৰ নাম",
10701070
"transactionOrderLabelOriginCedula": "উৎসৰ Cedula",
10711071
"transactionDetailAccelerate": "ত্বৰান্বিত কৰক",
1072-
"transactionDetailLabelTransactionId": "লেনদেন ID",
10731072
"transactionDetailLabelToWallet": "Wallet লৈ",
10741073
"transactionDetailLabelFromWallet": "Wallet-ৰ পৰা",
10751074
"transactionDetailLabelRecipientAddress": "প্ৰাপকৰ ঠিকনা",
@@ -8491,7 +8490,6 @@
84918490
"@appStartupErrorTitle": {
84928491
"description": "Title shown when the app fails to start up properly"
84938492
},
8494-
"appStartupErrorMessage": "এপটো আৰম্ভ হ'বলৈ বিফল হৈছে। এপটো সম্পূৰ্ণৰূপে বন্ধ কৰি পুনৰ আৰম্ভ কৰক। সমস্যাটো অব্যাহত থাকিলে, সহায়লৈ প্ৰতিবেদন দিয়ক আৰু আপোনাৰ লগ শ্বেয়াৰ কৰক।",
84958493
"@appStartupErrorMessage": {
84968494
"description": "Error message shown when app startup fails"
84978495
},
@@ -9674,7 +9672,6 @@
96749672
"@fundExchangeCopFailedToOpenLink": {
96759673
"description": "Error shown when the COP payment link fails to open"
96769674
},
9677-
"pinCodeBackupRequiredWarning": "PIN ছেট কৰাৰ আগতে অনুগ্ৰহ কৰি এটা ৱালেট বেকআপ সম্পূৰ্ণ কৰক",
96789675
"coreScreensResolvingInputs": "Resolving transaction inputs...",
96799676
"coreScreensFeeRateLabel": "Fee rate",
96809677
"coreScreensFeeRateValue": "{rate} sat/vB",

localization/app_bg.arb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4664,10 +4664,6 @@
46644664
"@fundExchangeWarningDescription": {
46654665
"description": "Warning message about potential scammers when funding account"
46664666
},
4667-
"transactionDetailLabelTransactionId": "ID на транзакцията",
4668-
"@transactionDetailLabelTransactionId": {
4669-
"description": "Label for transaction ID in details"
4670-
},
46714667
"arkReceiveTitle": "Ark получаване",
46724668
"@arkReceiveTitle": {
46734669
"description": "AppBar title for Ark receive screen"
@@ -9730,6 +9726,5 @@
97309726
"exchangeSupportChatPermissionDeniedSettings": "Достъпът е отказан. Моля, разрешете достъпа до фотогалерията в Настройките.",
97319727
"exchangeSupportChatPickFilesFailed": "Изборът на файлове не успя. Моля, опитайте отново.",
97329728
"exchangeSupportChatAttachLogsFailed": "Прикачването на регистри не успя. Моля, опитайте отново.",
9733-
"exchangeSupportChatFetchFileDataFailed": "Извличането на данните от файла не успя.",
9734-
"importMnemonicDuplicateError": "Тази мнемонична фраза вече съществува"
9729+
"exchangeSupportChatFetchFileDataFailed": "Извличането на данните от файла не успя."
97359730
}

localization/app_bn.arb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5827,10 +5827,6 @@
58275827
"@fundExchangeWarningDescription": {
58285828
"description": "Warning message about potential scammers when funding account"
58295829
},
5830-
"transactionDetailLabelTransactionId": "লেনদেনের আইডি",
5831-
"@transactionDetailLabelTransactionId": {
5832-
"description": "Label for transaction ID in details"
5833-
},
58345830
"arkReceiveTitle": "আর্ক গ্রহণ",
58355831
"@arkReceiveTitle": {
58365832
"description": "AppBar title for Ark receive screen"

localization/app_cs.arb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5986,10 +5986,6 @@
59865986
"@fundExchangeWarningDescription": {
59875987
"description": "Warning message about potential scammers when funding account"
59885988
},
5989-
"transactionDetailLabelTransactionId": "ID transakce",
5990-
"@transactionDetailLabelTransactionId": {
5991-
"description": "Label for transaction ID in details"
5992-
},
59935989
"arkReceiveTitle": "Ark Obdržet",
59945990
"@arkReceiveTitle": {
59955991
"description": "AppBar title for Ark receive screen"
@@ -12719,6 +12715,5 @@
1271912715
"exchangeSupportChatPermissionDeniedSettings": "Oprávnění zamítnuto. Povolte přístup k fotogalerii v Nastavení.",
1272012716
"exchangeSupportChatPickFilesFailed": "Výběr souborů se nezdařil. Zkuste to znovu.",
1272112717
"exchangeSupportChatAttachLogsFailed": "Připojení záznamů se nezdařilo. Zkuste to znovu.",
12722-
"exchangeSupportChatFetchFileDataFailed": "Načtení dat souboru se nezdařilo.",
12723-
"importMnemonicDuplicateError": "Tato mnemotechnická fráze již existuje"
12718+
"exchangeSupportChatFetchFileDataFailed": "Načtení dat souboru se nezdařilo."
1272412719
}

localization/app_de.arb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,6 @@
19311931
"appleICloudProvider": "Apple iCloud",
19321932
"exchangeAccountInfoVerificationNotVerified": "Nicht verifiziert",
19331933
"fundExchangeWarningDescription": "Wenn jemand Sie auffordert, Bitcoin zu kaufen oder Ihnen „zu helfen“, seien Sie vorsichtig, denn möglicherweise versucht er, Sie zu betrügen!",
1934-
"transactionDetailLabelTransactionId": "Transaktions-ID",
19351934
"arkReceiveTitle": "Empfangen",
19361935
"payDebitCardNumberHint": "Debitkartennummer eingeben",
19371936
"backupWalletHowToDecideBackupEncryptedRecommendation": "Verschlüsselter Tresor:",
@@ -4628,6 +4627,5 @@
46284627
"exchangeSupportChatPermissionDeniedSettings": "Berechtigung verweigert. Bitte erlauben Sie den Zugriff auf die Fotobibliothek in den Einstellungen.",
46294628
"exchangeSupportChatPickFilesFailed": "Auswahl der Dateien fehlgeschlagen. Bitte versuchen Sie es erneut.",
46304629
"exchangeSupportChatAttachLogsFailed": "Anhängen der Protokolle fehlgeschlagen. Bitte versuchen Sie es erneut.",
4631-
"exchangeSupportChatFetchFileDataFailed": "Abrufen der Dateidaten fehlgeschlagen.",
4632-
"importMnemonicDuplicateError": "Diese Mnemonic existiert bereits"
4630+
"exchangeSupportChatFetchFileDataFailed": "Abrufen der Dateidaten fehlgeschlagen."
46334631
}

localization/app_el.arb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11221,10 +11221,6 @@
1122111221
"@appleICloudProvider": {
1122211222
"description": "Name of Apple iCloud provider"
1122311223
},
11224-
"transactionDetailLabelTransactionId": "Σύνδεση ID",
11225-
"@transactionDetailLabelTransactionId": {
11226-
"description": "Label for transaction ID in details"
11227-
},
1122811224
"arkReceiveTitle": "Ark παραλαβή",
1122911225
"@arkReceiveTitle": {
1123011226
"description": "AppBar title for Ark receive screen"
@@ -12719,6 +12715,5 @@
1271912715
"exchangeSupportChatPermissionDeniedSettings": "Η άδεια απορρίφθηκε. Παραχωρήστε πρόσβαση στη βιβλιοθήκη φωτογραφιών στις Ρυθμίσεις.",
1272012716
"exchangeSupportChatPickFilesFailed": "Η επιλογή αρχείων απέτυχε. Δοκιμάστε ξανά.",
1272112717
"exchangeSupportChatAttachLogsFailed": "Η επισύναψη αρχείων καταγραφής απέτυχε. Δοκιμάστε ξανά.",
12722-
"exchangeSupportChatFetchFileDataFailed": "Η ανάκτηση δεδομένων αρχείου απέτυχε.",
12723-
"importMnemonicDuplicateError": "Αυτή η μνημονική φράση υπάρχει ήδη"
12718+
"exchangeSupportChatFetchFileDataFailed": "Η ανάκτηση δεδομένων αρχείου απέτυχε."
1272412719
}

localization/app_en.arb

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3170,15 +3170,11 @@
31703170
"@transactionDetailAccelerate": {
31713171
"description": "Button label for accelerating (RBF) an unconfirmed transaction"
31723172
},
3173-
"transactionDetailLabelTransactionId": "Transaction ID",
3174-
"@transactionDetailLabelTransactionId": {
3175-
"description": "Label for transaction ID in details"
3176-
},
3177-
"transactionDetailLabelToWallet": "To wallet",
3173+
"transactionDetailLabelToWallet": "To Wallet",
31783174
"@transactionDetailLabelToWallet": {
31793175
"description": "Label for destination wallet"
31803176
},
3181-
"transactionDetailLabelFromWallet": "From wallet",
3177+
"transactionDetailLabelFromWallet": "From Wallet",
31823178
"@transactionDetailLabelFromWallet": {
31833179
"description": "Label for source wallet"
31843180
},
@@ -3190,15 +3186,15 @@
31903186
"@transactionDetailLabelAddress": {
31913187
"description": "Label for address"
31923188
},
3193-
"transactionDetailLabelAddressNotes": "Address notes",
3189+
"transactionDetailLabelAddressNotes": "Address Notes",
31943190
"@transactionDetailLabelAddressNotes": {
31953191
"description": "Label for address notes"
31963192
},
3197-
"transactionDetailLabelAmountReceived": "Amount received",
3193+
"transactionDetailLabelAmountReceived": "Amount Received",
31983194
"@transactionDetailLabelAmountReceived": {
31993195
"description": "Label for amount received"
32003196
},
3201-
"transactionDetailLabelAmountSent": "Amount sent",
3197+
"transactionDetailLabelAmountSent": "Amount Sent",
32023198
"@transactionDetailLabelAmountSent": {
32033199
"description": "Label for amount sent"
32043200
},
@@ -3210,7 +3206,7 @@
32103206
"@transactionDetailLabelStatus": {
32113207
"description": "Label for status"
32123208
},
3213-
"transactionDetailLabelConfirmationTime": "Confirmation time",
3209+
"transactionDetailLabelConfirmationTime": "Confirmation Time",
32143210
"@transactionDetailLabelConfirmationTime": {
32153211
"description": "Label for confirmation time"
32163212
},
@@ -3222,23 +3218,23 @@
32223218
"@transactionDetailLabelOrderNumber": {
32233219
"description": "Label for order number"
32243220
},
3225-
"transactionDetailLabelPayinAmount": "Payin amount",
3221+
"transactionDetailLabelPayinAmount": "Payin Amount",
32263222
"@transactionDetailLabelPayinAmount": {
32273223
"description": "Label for payin amount"
32283224
},
3229-
"transactionDetailLabelPayoutAmount": "Payout amount",
3225+
"transactionDetailLabelPayoutAmount": "Payout Amount",
32303226
"@transactionDetailLabelPayoutAmount": {
32313227
"description": "Label for payout amount"
32323228
},
3233-
"transactionDetailLabelExchangeRate": "Exchange rate",
3229+
"transactionDetailLabelExchangeRate": "Exchange Rate",
32343230
"@transactionDetailLabelExchangeRate": {
32353231
"description": "Label for exchange rate"
32363232
},
3237-
"transactionDetailLabelPayinMethod": "Payin method",
3233+
"transactionDetailLabelPayinMethod": "Payin Method",
32383234
"@transactionDetailLabelPayinMethod": {
32393235
"description": "Label for payin method"
32403236
},
3241-
"transactionDetailLabelPayoutMethod": "Payout method",
3237+
"transactionDetailLabelPayoutMethod": "Payout Method",
32423238
"@transactionDetailLabelPayoutMethod": {
32433239
"description": "Label for payout method"
32443240
},
@@ -3314,7 +3310,7 @@
33143310
"@transactionDetailLabelTransferFee": {
33153311
"description": "Label for transfer fee (Boltz fee)"
33163312
},
3317-
"transactionDetailLabelPayjoinStatus": "Payjoin status",
3313+
"transactionDetailLabelPayjoinStatus": "Payjoin Status",
33183314
"@transactionDetailLabelPayjoinStatus": {
33193315
"description": "Label for payjoin status"
33203316
},
@@ -3326,7 +3322,7 @@
33263322
"@transactionDetailLabelPayjoinExpired": {
33273323
"description": "Payjoin expired status"
33283324
},
3329-
"transactionDetailLabelPayjoinCreationTime": "Payjoin creation time",
3325+
"transactionDetailLabelPayjoinCreationTime": "Payjoin Creation Time",
33303326
"@transactionDetailLabelPayjoinCreationTime": {
33313327
"description": "Label for payjoin creation time"
33323328
},

localization/app_es.arb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,6 @@
758758
"transactionOrderLabelOriginName": "Nombre de origen",
759759
"transactionOrderLabelOriginCedula": "Cédula de origen",
760760
"transactionDetailAccelerate": "Acelerar",
761-
"transactionDetailLabelTransactionId": "ID de transacción",
762761
"transactionDetailLabelToWallet": "A monedero",
763762
"transactionDetailLabelFromWallet": "Desde monedero",
764763
"transactionDetailLabelRecipientAddress": "Dirección del destinatario",
@@ -4745,6 +4744,5 @@
47454744
"exchangeSupportChatPermissionDeniedSettings": "Permiso denegado. Concede acceso a la biblioteca de fotos en Ajustes.",
47464745
"exchangeSupportChatPickFilesFailed": "No se pudieron seleccionar los archivos. Inténtalo de nuevo.",
47474746
"exchangeSupportChatAttachLogsFailed": "No se pudieron adjuntar los registros. Inténtalo de nuevo.",
4748-
"exchangeSupportChatFetchFileDataFailed": "No se pudieron obtener los datos del archivo.",
4749-
"importMnemonicDuplicateError": "Esta frase mnemónica ya existe"
4747+
"exchangeSupportChatFetchFileDataFailed": "No se pudieron obtener los datos del archivo."
47504748
}

0 commit comments

Comments
 (0)