From b8dba363f593c4014e70df5cdd362197ad169c23 Mon Sep 17 00:00:00 2001 From: beerosagos Date: Tue, 1 Oct 2024 09:40:22 +0200 Subject: [PATCH 1/4] 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 1ea08f40e2..2c6479b8c1 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 bfd96e3d2872c1e8b5ed856c04a59f2ab8b49731 Mon Sep 17 00:00:00 2001 From: thisconnect Date: Tue, 1 Oct 2024 13:59:10 +0200 Subject: [PATCH 2/4] 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 6901e5f4f68f2bfc08f7ae368b2280a301233798 Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Tue, 1 Oct 2024 14:48:43 +0200 Subject: [PATCH 3/4] 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 | 5 +++-- 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, 28 insertions(+), 23 deletions(-) diff --git a/frontends/web/src/locales/ar/app.json b/frontends/web/src/locales/ar/app.json index 85ad84989d..32a71a072f 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 afff6e31d4..613de4f1fc 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", @@ -744,7 +745,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 eca741a8f2..e4bd72aa3a 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 7e14e50a29..8267671ec3 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": "Compra", "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": "Venta" }, "info": { "continue": "Aceptar y continuar", diff --git a/frontends/web/src/locales/fr/app.json b/frontends/web/src/locales/fr/app.json index 36a7b12d9f..b71b789c29 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 afc44641fa..f55d4635dc 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 609b063c35..4f202ec7f7 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 2d7d3a10ac..9f8894d3de 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 cf058b4f34..a0bee4d3a8 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 87e40e4e32..80ddc184cb 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 1ad48ab84f..3490dbcd48 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 881839841a..cedfaa1918 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 6c852cbb52..1c7233fae2 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 fef243bd2a01c828e2b52cc4a49c030dcfdf6b35 Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Tue, 1 Oct 2024 14:29:59 +0200 Subject: [PATCH 4/4] backend: update to version 4.44.1 --- CHANGELOG.md | 3 +++ backend/update.go | 2 +- frontends/android/BitBoxApp/app/build.gradle | 4 ++-- frontends/qt/Makefile | 4 ++-- frontends/qt/resources/MacOS/Info.plist | 4 ++-- frontends/qt/setup.nsi | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5035245658..8cbceefc56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +## 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/backend/update.go b/backend/update.go index 62cd29ba05..b54f2416c4 100644 --- a/backend/update.go +++ b/backend/update.go @@ -27,7 +27,7 @@ const updateFileURL = "https://bitboxapp.shiftcrypto.io/desktop.json" var ( // Version of the backend as displayed to the user. - Version = semver.NewSemVer(4, 44, 0) + Version = semver.NewSemVer(4, 44, 1) ) // UpdateFile is retrieved from the server. diff --git a/frontends/android/BitBoxApp/app/build.gradle b/frontends/android/BitBoxApp/app/build.gradle index 78dca626d3..6d08955635 100644 --- a/frontends/android/BitBoxApp/app/build.gradle +++ b/frontends/android/BitBoxApp/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "ch.shiftcrypto.bitboxapp" minSdkVersion 21 targetSdkVersion 34 - versionCode 52 - versionName "android-4.44.0" + versionCode 53 + versionName "android-4.44.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile index 459dd976f9..b6573f80d1 100644 --- a/frontends/qt/Makefile +++ b/frontends/qt/Makefile @@ -38,8 +38,8 @@ linux: cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp mkdir build/tmp-deb/opt/ cp -aR build/linux-tmp build/tmp-deb/opt/bitbox - cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.44.0 -C ../tmp-deb/ - cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.44.0 -C ../tmp-deb/ + cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.44.1 -C ../tmp-deb/ + cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.44.1 -C ../tmp-deb/ # create AppImage cd build/linux-tmp && /opt/linuxdeployqt-7-x86_64.AppImage BitBox -appimage -unsupported-allow-new-glibc mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/ diff --git a/frontends/qt/resources/MacOS/Info.plist b/frontends/qt/resources/MacOS/Info.plist index 0e951291f9..b09e32ff41 100644 --- a/frontends/qt/resources/MacOS/Info.plist +++ b/frontends/qt/resources/MacOS/Info.plist @@ -21,10 +21,10 @@ APPL CFBundleVersion - 4.44.0 + 4.44.1 CFBundleShortVersionString - 4.44.0 + 4.44.1 CFBundleSignature ???? diff --git a/frontends/qt/setup.nsi b/frontends/qt/setup.nsi index 035057bc46..e778ae63df 100755 --- a/frontends/qt/setup.nsi +++ b/frontends/qt/setup.nsi @@ -22,7 +22,7 @@ SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 4.44.0.0 +!define VERSION 4.44.1.0 !define COMPANY "Shift Crypto AG" !define URL https://github.com/BitBoxSwiss/bitbox-wallet-app/releases/ !define BINDIR "build\windows"