From a727fdd47cd4ea40d21c12334372a358fc99f35d Mon Sep 17 00:00:00 2001 From: beerosagos Date: Tue, 1 Oct 2024 09:40:22 +0200 Subject: [PATCH 1/6] frontend/exchange: fix wrong buy/sell tabs labels Also remove unused "button.buy" locize label. --- frontends/web/src/locales/en/app.json | 5 +++-- frontends/web/src/routes/exchange/components/exchangetab.tsx | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontends/web/src/locales/en/app.json b/frontends/web/src/locales/en/app.json index 45e048b489..8010b28994 100644 --- a/frontends/web/src/locales/en/app.json +++ b/frontends/web/src/locales/en/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Abort", "back": "Back", - "buy": "Buy", "changepin": "Change device password", "check": "Check backup", "continue": "Continue", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Bank transfer", "bestDeal": "Best deal", + "buy": "Buy", "creditCard": "Credit card", "fast": "Fast", "fee": "fee", @@ -459,7 +459,8 @@ }, "noExchanges": "Sorry, there are no available exchanges in this region.", "region": "Region", - "selectRegion": "Not specified" + "selectRegion": "Not specified", + "sell": "Sell" }, "info": { "continue": "Agree and continue", diff --git a/frontends/web/src/routes/exchange/components/exchangetab.tsx b/frontends/web/src/routes/exchange/components/exchangetab.tsx index b12c57ad08..7fb535b773 100644 --- a/frontends/web/src/routes/exchange/components/exchangetab.tsx +++ b/frontends/web/src/routes/exchange/components/exchangetab.tsx @@ -36,13 +36,13 @@ export const ExchangeTab = ({ active={activeTab === 'buy'} onClick={() => onChangeTab('buy')} > - {t('Buy')} + {t('buy.exchange.buy')} onChangeTab('sell')} > - {t('Sell')} + {t('buy.exchange.sell')} ); From cd0e9f603180bdfa117f3a568af262eaa10aaa47 Mon Sep 17 00:00:00 2001 From: thisconnect Date: Tue, 1 Oct 2024 13:59:10 +0200 Subject: [PATCH 2/6] frontend: allow action buttons to grow on mobile With different translations the action buttons (send, receive, buy & sell and WC) did not break nicely on small screen. Due to limited button height the text could be outside of the button and only visible in darkmode but not in normal mode (white on gray). Changed to let the buttons break onto 2 lines of text if there is not enough horozontal space. --- frontends/web/src/routes/account/account.module.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontends/web/src/routes/account/account.module.css b/frontends/web/src/routes/account/account.module.css index 4db3bd7dcd..fe41b982d0 100644 --- a/frontends/web/src/routes/account/account.module.css +++ b/frontends/web/src/routes/account/account.module.css @@ -22,6 +22,7 @@ .actionsContainer { display: flex; + flex-wrap: nowrap; transform: translateY(-36%); margin-top: calc(var(--space-quarter) * 2); padding-bottom: 14px; @@ -31,17 +32,18 @@ .receive, .walletConnect, .send { + align-items: center; background-color: var(--color-blue); border-radius: 2px; color: var(--color-alt); - display: inline-block; + display: inline-flex; font-size: var(--size-default); - height: calc(var(--item-height) / 1.5); - line-height: calc(var(--item-height) / 1.5); + justify-content: center; margin-bottom: var(--space-quarter); margin-left: var(--space-quarter); + min-height: calc(var(--item-height) / 1.5); min-width: calc(var(--item-height) * 2); - padding: 0 var(--space-half); + padding: var(--space-quarter) var(--space-half); text-align: center; text-decoration: none; transition: background-color ease-out 0.2s; @@ -54,7 +56,6 @@ } .withWalletConnect.actionsContainer { - flex-wrap: wrap; justify-content: flex-end; } @@ -82,7 +83,6 @@ @media (max-width: 768px) { .actionsContainer { - flex-wrap: wrap; justify-content: space-between; margin-bottom: var(--space-default); margin-left: auto; From cdb1b2ccbd360dfee8c8d6699cd86fc4960a784d Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Tue, 1 Oct 2024 14:48:43 +0200 Subject: [PATCH 3/6] frontend: make locize-pull --- frontends/web/src/locales/ar/app.json | 1 - frontends/web/src/locales/cs/app.json | 7 ++++--- frontends/web/src/locales/de/app.json | 5 +++-- frontends/web/src/locales/es/app.json | 9 +++++---- frontends/web/src/locales/fr/app.json | 1 - frontends/web/src/locales/he/app.json | 1 - frontends/web/src/locales/it/app.json | 5 +++-- frontends/web/src/locales/ja/app.json | 5 +++-- frontends/web/src/locales/ms/app.json | 5 +++-- frontends/web/src/locales/nl/app.json | 5 +++-- frontends/web/src/locales/pt/app.json | 5 +++-- frontends/web/src/locales/ru/app.json | 1 - frontends/web/src/locales/sl/app.json | 5 +++-- 13 files changed, 30 insertions(+), 25 deletions(-) diff --git a/frontends/web/src/locales/ar/app.json b/frontends/web/src/locales/ar/app.json index bcf2c2f1f7..241be98a1b 100644 --- a/frontends/web/src/locales/ar/app.json +++ b/frontends/web/src/locales/ar/app.json @@ -276,7 +276,6 @@ "button": { "abort": "الايقاف", "back": "العودة", - "buy": "الشراء", "changepin": "قم بتغيير كلمة مرور الجهاز", "check": "قم بالتحقق من النسخة الاحتياطية", "continue": "الاستمرار", diff --git a/frontends/web/src/locales/cs/app.json b/frontends/web/src/locales/cs/app.json index d2ed18b8e5..6d9c1c5b57 100644 --- a/frontends/web/src/locales/cs/app.json +++ b/frontends/web/src/locales/cs/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Zrušit", "back": "Zpět", - "buy": "Koupit", "changepin": "Změňit heslo zařízení", "check": "Zkontrolovat zálohu", "continue": "Pokračovat", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Bankovní převod", "bestDeal": "Nejvýhodnější nabídka", + "buy": "Koupit", "creditCard": "Kreditní karta", "fast": "Rychle", "fee": "poplatek", @@ -459,7 +459,8 @@ }, "noExchanges": "Je nám líto, ale v této oblasti nejsou k dispozici žádné burzy.", "region": "Oblast", - "selectRegion": "Není uvedeno" + "selectRegion": "Není uvedeno", + "sell": "Prodat" }, "info": { "continue": "Souhlasím, pokračovat", @@ -739,7 +740,7 @@ "buy": "Koupit {{coinCode}}", "buySell": "Nákup a prodej", "buy_bitcoin": "Koupit Bitcoin", - "buy_crypto": "Koupit crypto", + "buy_crypto": "Koupit krypto", "enabled_false": "Vypnuto", "enabled_true": "Zapnuto", "receive": "Přijmout {{coinCode}}", diff --git a/frontends/web/src/locales/de/app.json b/frontends/web/src/locales/de/app.json index 8ed9506045..c2ee374409 100644 --- a/frontends/web/src/locales/de/app.json +++ b/frontends/web/src/locales/de/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Abbrechen", "back": "Zurück", - "buy": "Kaufen", "changepin": "Gerätepasswort ändern", "check": "Backup überprüfen", "continue": "Weiter", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Überweisung", "bestDeal": "Bestes Angebot", + "buy": "Kaufen", "creditCard": "Kreditkarte", "fast": "Schnell", "fee": "Gebühr", @@ -459,7 +459,8 @@ }, "noExchanges": "Leider sind in dieser Region keine Börsen verfügbar.", "region": "Region", - "selectRegion": "Nicht angegeben" + "selectRegion": "Nicht angegeben", + "sell": "Verkaufen" }, "info": { "continue": "Zustimmen und fortfahren", diff --git a/frontends/web/src/locales/es/app.json b/frontends/web/src/locales/es/app.json index 1eb9c12b3e..0dd9b1b0de 100644 --- a/frontends/web/src/locales/es/app.json +++ b/frontends/web/src/locales/es/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Cancel", "back": "Atrás", - "buy": "Comprar", "changepin": "Cambiar contraseña del dispositivo", "check": "Comprobar la copia de seguridad", "continue": "Continuar", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Transferencia bancaria", "bestDeal": "La mejor oferta", + "buy": "Comprar", "creditCard": "Tarjeta de crédito", "fast": "Rápido", "fee": "tarifa", @@ -459,7 +459,8 @@ }, "noExchanges": "Lo sentimos, no hay intercambios disponibles en esta región.", "region": "Región", - "selectRegion": "No especificado" + "selectRegion": "No especificado", + "sell": "Vender" }, "info": { "continue": "Aceptar y continuar", @@ -1015,7 +1016,7 @@ "account": "Guía de cuentas", "accountInformation": "Guía de información de cuentas", "accountSummary": "Guía de resumen de cuentas", - "advancedSettings": "Guía de ajustes avanzados", + "advancedSettings": "Guía de Configuración avanzada", "appearance": "Guía de apariencia", "buySell": "Guía de compra y venta", "insurance": "Guía de seguros", @@ -1399,7 +1400,7 @@ "successDisabled": { "message": "Passphrase opcional activada satisfactoriamente!\nA partir de ahora se le solicitara introducir una passphrase.", "messageEnd": "Por favor vuelva a conectar ahora su BitBox02.", - "title": "Passphrase activado" + "title": "Passphrase activada" }, "successEnabled": { "message": "Passphrase opcional desactivada satisfactoriamente!\nA partir de ahora no se le solicitará introducir una passphrase.", diff --git a/frontends/web/src/locales/fr/app.json b/frontends/web/src/locales/fr/app.json index dc21c0bb7a..21b9ab0862 100644 --- a/frontends/web/src/locales/fr/app.json +++ b/frontends/web/src/locales/fr/app.json @@ -356,7 +356,6 @@ "button": { "abort": "Abandonner", "back": "Retour", - "buy": "Acheter", "changepin": "Changer le mot de passe de l'appareil", "check": "Vérifier la sauvegarde", "continue": "Continuer", diff --git a/frontends/web/src/locales/he/app.json b/frontends/web/src/locales/he/app.json index 764ed7526a..0eaa6d7494 100644 --- a/frontends/web/src/locales/he/app.json +++ b/frontends/web/src/locales/he/app.json @@ -217,7 +217,6 @@ "button": { "abort": "בטל", "back": "חזור", - "buy": "קנה", "changepin": "החלף סיסמת התקן", "check": "בדוק גיבוי", "continue": "המשך", diff --git a/frontends/web/src/locales/it/app.json b/frontends/web/src/locales/it/app.json index dd19b9fec8..4f23751d01 100644 --- a/frontends/web/src/locales/it/app.json +++ b/frontends/web/src/locales/it/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Interrompere", "back": "Indietro", - "buy": "Acquista", "changepin": "Cambia la password del dispositivo", "check": "Verifica il backup", "continue": "Continua", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Bonifico bancario", "bestDeal": "Miglior prezzo", + "buy": "Compra", "creditCard": "Carta di credito", "fast": "Rapido", "fee": "commissione", @@ -459,7 +459,8 @@ }, "noExchanges": "Mi dispiace, non ci sono exchange disponibili in questo Paese", "region": "Paese", - "selectRegion": "Non specificato" + "selectRegion": "Non specificato", + "sell": "Vendi" }, "info": { "continue": "Accetta e continua", diff --git a/frontends/web/src/locales/ja/app.json b/frontends/web/src/locales/ja/app.json index cecc23f6d2..ac5a615c03 100644 --- a/frontends/web/src/locales/ja/app.json +++ b/frontends/web/src/locales/ja/app.json @@ -372,7 +372,6 @@ "button": { "abort": "中止", "back": "戻る", - "buy": "購入", "changepin": "デバイスのパスワード変更", "check": "バックアップの確認", "continue": "続行", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "銀行振込", "bestDeal": "最良の取引", + "buy": "買う", "creditCard": "クレジットカード", "fast": "高速", "fee": "手数料", @@ -459,7 +459,8 @@ }, "noExchanges": "申し訳ございませんが、この地域では利用可能な取引所はございません。", "region": "地域", - "selectRegion": "指定なし" + "selectRegion": "指定なし", + "sell": "売る" }, "info": { "continue": "同意して続ける", diff --git a/frontends/web/src/locales/ms/app.json b/frontends/web/src/locales/ms/app.json index fd02d2d4d8..ce938956b5 100644 --- a/frontends/web/src/locales/ms/app.json +++ b/frontends/web/src/locales/ms/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Tinggalkan", "back": "Kembali", - "buy": "Beli", "changepin": "Ubah kata laluan peranti", "check": "Semak Backup", "continue": "Teruskan", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Transfer bank", "bestDeal": "Tawaran terbaik", + "buy": "Beli", "creditCard": "Kad kredit", "fast": "Cepat", "fee": "bayaran", @@ -459,7 +459,8 @@ }, "noExchanges": "Maaf, tiada pertukaran tersedia di rantau ini.", "region": "Wilayah", - "selectRegion": "Tidak dinyatakan" + "selectRegion": "Tidak dinyatakan", + "sell": "jual" }, "info": { "continue": "Setuju dan teruskan", diff --git a/frontends/web/src/locales/nl/app.json b/frontends/web/src/locales/nl/app.json index 0823d3d634..0253bce201 100644 --- a/frontends/web/src/locales/nl/app.json +++ b/frontends/web/src/locales/nl/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Annuleren", "back": "Terug", - "buy": "Koop", "changepin": "BitBox-wachtwoord veranderen", "check": "Backup controleren", "continue": "Verder", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Bankoverschrijving", "bestDeal": "Beste deal", + "buy": "Kopen", "creditCard": "Creditcard", "fast": "Snel", "fee": "transactiekosten", @@ -459,7 +459,8 @@ }, "noExchanges": "Sorry, er zijn geen exchanges beschikbaar in jouw regio", "region": "Regio", - "selectRegion": "Niet aangegeven" + "selectRegion": "Niet aangegeven", + "sell": "Verkopen" }, "info": { "continue": "Akkoord, verder", diff --git a/frontends/web/src/locales/pt/app.json b/frontends/web/src/locales/pt/app.json index 5a28ad32ed..59a2784772 100644 --- a/frontends/web/src/locales/pt/app.json +++ b/frontends/web/src/locales/pt/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Abortar", "back": "Voltar", - "buy": "Comprar", "changepin": "Mudar senha do dispositivo", "check": "Checar backup", "continue": "Continuar", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Transferência bancária", "bestDeal": "Melhor oferta", + "buy": "Comprar", "creditCard": "Cartão de crédito", "fast": "Rápido", "fee": "taxa", @@ -459,7 +459,8 @@ }, "noExchanges": "Desculpe, não há exchanges disponíveis nesta região.", "region": "Região", - "selectRegion": "Não especificada" + "selectRegion": "Não especificada", + "sell": "Vender" }, "info": { "continue": "Concordo e continue", diff --git a/frontends/web/src/locales/ru/app.json b/frontends/web/src/locales/ru/app.json index b3e3bdd7fb..73fd4a48b3 100644 --- a/frontends/web/src/locales/ru/app.json +++ b/frontends/web/src/locales/ru/app.json @@ -276,7 +276,6 @@ "button": { "abort": "Прервать", "back": "Назад", - "buy": "Купить", "changepin": "Изменить пароль устройства", "check": "Проверить резервную копию", "continue": "Продолжить", diff --git a/frontends/web/src/locales/sl/app.json b/frontends/web/src/locales/sl/app.json index a7ac8df32f..44f57cb12d 100644 --- a/frontends/web/src/locales/sl/app.json +++ b/frontends/web/src/locales/sl/app.json @@ -372,7 +372,6 @@ "button": { "abort": "Prekini", "back": "Nazaj", - "buy": "Kupi", "changepin": "Spremenite geslo naprave", "check": "Preverite varnostno kopijo", "continue": "Nadaljujte", @@ -398,6 +397,7 @@ "exchange": { "bankTransfer": "Bančno nakazilo", "bestDeal": "Najboljša ponudba", + "buy": "Nakup", "creditCard": "Kreditna karica", "fast": "Hitro", "fee": "provizija", @@ -459,7 +459,8 @@ }, "noExchanges": "V tej regiji žal ni razpoložljivih menjalnic.", "region": "Regija", - "selectRegion": "Ni navedeno" + "selectRegion": "Ni navedeno", + "sell": "Prodaja" }, "info": { "continue": "Potrdi in nadaljuj", From df7348de4726b8cd5fcbc3943aa3e1800de056d7 Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Tue, 1 Oct 2024 14:29:59 +0200 Subject: [PATCH 4/6] backend: update to version 4.44.1 --- CHANGELOG.md | 3 +++ frontends/android/BitBoxApp/app/build.gradle | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3baa98e46..c6f016992f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - Bitcoin: add support for sending to silent payment (BIP-352) addresses - Prevent macOS from going to sleep on long running interactions with the BitBox +## 4.44.1 +- Minor UI bugfixes + ## 4.44.0 - Bundle BitBox02 firmware version v9.20.0 - Add support for selling bitcoin in-app via Pocket diff --git a/frontends/android/BitBoxApp/app/build.gradle b/frontends/android/BitBoxApp/app/build.gradle index 4d024d092a..b1f6d98d83 100644 --- a/frontends/android/BitBoxApp/app/build.gradle +++ b/frontends/android/BitBoxApp/app/build.gradle @@ -7,7 +7,7 @@ android { applicationId "ch.shiftcrypto.bitboxapp" minSdkVersion 21 targetSdkVersion 34 - versionCode 53 + versionCode 54 versionName "android-4.45.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From a6121ca9158942b06c4cae8e38e0f29fd3b91dce Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Wed, 9 Oct 2024 09:45:26 +0200 Subject: [PATCH 5/6] frontend: make locize-pull --- frontends/web/src/locales/es/app.json | 2 +- frontends/web/src/locales/it/app.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontends/web/src/locales/es/app.json b/frontends/web/src/locales/es/app.json index 0dd9b1b0de..21929cc285 100644 --- a/frontends/web/src/locales/es/app.json +++ b/frontends/web/src/locales/es/app.json @@ -738,7 +738,7 @@ }, "generic": { "buy": "Comprar {{coinCode}} ", - "buySell": "Compra y venta", + "buySell": "Comprar y vender", "buy_bitcoin": "Comprar Bitcoin ", "buy_crypto": "Comprar criptomonedas", "enabled_false": "Desactivado", diff --git a/frontends/web/src/locales/it/app.json b/frontends/web/src/locales/it/app.json index 4f23751d01..a9635d9871 100644 --- a/frontends/web/src/locales/it/app.json +++ b/frontends/web/src/locales/it/app.json @@ -577,7 +577,7 @@ "description": "La root fingerprint è un identificatore univoco del wallet attualmente in uso. Ti può aiutare a distinguere wallet diversi se usi la passphrase." }, "securechip": { - "description": "Modello del secur chip." + "description": "Modello del secure chip." }, "title": "Informazioni sul dispositivo" }, From 5a1733c912cb0ad38e91f25226eb015e1ab845ca Mon Sep 17 00:00:00 2001 From: sl Date: Wed, 9 Oct 2024 11:45:48 +0200 Subject: [PATCH 6/6] frontend: fix spacing between receiver address and tx detail label this commit ensures consistent spacing between "Receiver address" and "Transaction details" by using a container with fixed height and margin, always rendered, regardless of coin control being enabled or disabled. --- frontends/web/src/routes/account/send/send.module.css | 2 +- frontends/web/src/routes/account/send/send.tsx | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontends/web/src/routes/account/send/send.module.css b/frontends/web/src/routes/account/send/send.module.css index 679876455e..dac1c8f679 100644 --- a/frontends/web/src/routes/account/send/send.module.css +++ b/frontends/web/src/routes/account/send/send.module.css @@ -4,6 +4,6 @@ .coinControlButtonContainer { - height: 50px; + height: 58px; margin-bottom: var(--space-quarter); } \ No newline at end of file diff --git a/frontends/web/src/routes/account/send/send.tsx b/frontends/web/src/routes/account/send/send.tsx index d83ecf0297..17295bf71b 100644 --- a/frontends/web/src/routes/account/send/send.tsx +++ b/frontends/web/src/routes/account/send/send.tsx @@ -441,10 +441,13 @@ class Send extends Component {
- +
+ +
+