Skip to content

Commit e43e676

Browse files
committed
Merge remote-tracking branch 'benma/v4.44.1-to-4.45' into release-v4.45.0
2 parents f9ec869 + df7348d commit e43e676

File tree

16 files changed

+40
-32
lines changed

16 files changed

+40
-32
lines changed

Diff for: CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
- Bitcoin: add support for sending to silent payment (BIP-352) addresses
88
- Prevent macOS from going to sleep on long running interactions with the BitBox
99

10+
## 4.44.1
11+
- Minor UI bugfixes
12+
1013
## 4.44.0
1114
- Bundle BitBox02 firmware version v9.20.0
1215
- Add support for selling bitcoin in-app via Pocket

Diff for: frontends/android/BitBoxApp/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
applicationId "ch.shiftcrypto.bitboxapp"
88
minSdkVersion 21
99
targetSdkVersion 34
10-
versionCode 53
10+
versionCode 54
1111
versionName "android-4.45.0"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}

Diff for: frontends/web/src/locales/ar/app.json

-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@
276276
"button": {
277277
"abort": "الايقاف",
278278
"back": "العودة",
279-
"buy": "الشراء",
280279
"changepin": "قم بتغيير كلمة مرور الجهاز",
281280
"check": "قم بالتحقق من النسخة الاحتياطية",
282281
"continue": "الاستمرار",

Diff for: frontends/web/src/locales/cs/app.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Zrušit",
374374
"back": "Zpět",
375-
"buy": "Koupit",
376375
"changepin": "Změňit heslo zařízení",
377376
"check": "Zkontrolovat zálohu",
378377
"continue": "Pokračovat",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Bankovní převod",
400399
"bestDeal": "Nejvýhodnější nabídka",
400+
"buy": "Koupit",
401401
"creditCard": "Kreditní karta",
402402
"fast": "Rychle",
403403
"fee": "poplatek",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Je nám líto, ale v této oblasti nejsou k dispozici žádné burzy.",
461461
"region": "Oblast",
462-
"selectRegion": "Není uvedeno"
462+
"selectRegion": "Není uvedeno",
463+
"sell": "Prodat"
463464
},
464465
"info": {
465466
"continue": "Souhlasím, pokračovat",
@@ -739,7 +740,7 @@
739740
"buy": "Koupit {{coinCode}}",
740741
"buySell": "Nákup a prodej",
741742
"buy_bitcoin": "Koupit Bitcoin",
742-
"buy_crypto": "Koupit crypto",
743+
"buy_crypto": "Koupit krypto",
743744
"enabled_false": "Vypnuto",
744745
"enabled_true": "Zapnuto",
745746
"receive": "Přijmout {{coinCode}}",

Diff for: frontends/web/src/locales/de/app.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Abbrechen",
374374
"back": "Zurück",
375-
"buy": "Kaufen",
376375
"changepin": "Gerätepasswort ändern",
377376
"check": "Backup überprüfen",
378377
"continue": "Weiter",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Überweisung",
400399
"bestDeal": "Bestes Angebot",
400+
"buy": "Kaufen",
401401
"creditCard": "Kreditkarte",
402402
"fast": "Schnell",
403403
"fee": "Gebühr",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Leider sind in dieser Region keine Börsen verfügbar.",
461461
"region": "Region",
462-
"selectRegion": "Nicht angegeben"
462+
"selectRegion": "Nicht angegeben",
463+
"sell": "Verkaufen"
463464
},
464465
"info": {
465466
"continue": "Zustimmen und fortfahren",

Diff for: frontends/web/src/locales/es/app.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Cancel",
374374
"back": "Atrás",
375-
"buy": "Comprar",
376375
"changepin": "Cambiar contraseña del dispositivo",
377376
"check": "Comprobar la copia de seguridad",
378377
"continue": "Continuar",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Transferencia bancaria",
400399
"bestDeal": "La mejor oferta",
400+
"buy": "Comprar",
401401
"creditCard": "Tarjeta de crédito",
402402
"fast": "Rápido",
403403
"fee": "tarifa",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Lo sentimos, no hay intercambios disponibles en esta región.",
461461
"region": "Región",
462-
"selectRegion": "No especificado"
462+
"selectRegion": "No especificado",
463+
"sell": "Vender"
463464
},
464465
"info": {
465466
"continue": "Aceptar y continuar",
@@ -1015,7 +1016,7 @@
10151016
"account": "Guía de cuentas",
10161017
"accountInformation": "Guía de información de cuentas",
10171018
"accountSummary": "Guía de resumen de cuentas",
1018-
"advancedSettings": "Guía de ajustes avanzados",
1019+
"advancedSettings": "Guía de Configuración avanzada",
10191020
"appearance": "Guía de apariencia",
10201021
"buySell": "Guía de compra y venta",
10211022
"insurance": "Guía de seguros",
@@ -1399,7 +1400,7 @@
13991400
"successDisabled": {
14001401
"message": "Passphrase opcional <strong>activada satisfactoriamente</strong>!\nA partir de ahora se le solicitara introducir una passphrase.",
14011402
"messageEnd": "Por favor vuelva a conectar ahora su BitBox02.",
1402-
"title": "Passphrase activado"
1403+
"title": "Passphrase activada"
14031404
},
14041405
"successEnabled": {
14051406
"message": "Passphrase opcional <strong>desactivada satisfactoriamente</strong>!\nA partir de ahora no se le solicitará introducir una passphrase.",

Diff for: frontends/web/src/locales/fr/app.json

-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@
356356
"button": {
357357
"abort": "Abandonner",
358358
"back": "Retour",
359-
"buy": "Acheter",
360359
"changepin": "Changer le mot de passe de l'appareil",
361360
"check": "Vérifier la sauvegarde",
362361
"continue": "Continuer",

Diff for: frontends/web/src/locales/he/app.json

-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217
"button": {
218218
"abort": "בטל",
219219
"back": "חזור",
220-
"buy": "קנה",
221220
"changepin": "החלף סיסמת התקן",
222221
"check": "בדוק גיבוי",
223222
"continue": "המשך",

Diff for: frontends/web/src/locales/it/app.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Interrompere",
374374
"back": "Indietro",
375-
"buy": "Acquista",
376375
"changepin": "Cambia la password del dispositivo",
377376
"check": "Verifica il backup",
378377
"continue": "Continua",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Bonifico bancario",
400399
"bestDeal": "Miglior prezzo",
400+
"buy": "Compra",
401401
"creditCard": "Carta di credito",
402402
"fast": "Rapido",
403403
"fee": "commissione",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Mi dispiace, non ci sono exchange disponibili in questo Paese",
461461
"region": "Paese",
462-
"selectRegion": "Non specificato"
462+
"selectRegion": "Non specificato",
463+
"sell": "Vendi"
463464
},
464465
"info": {
465466
"continue": "Accetta e continua",

Diff for: frontends/web/src/locales/ja/app.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "中止",
374374
"back": "戻る",
375-
"buy": "購入",
376375
"changepin": "デバイスのパスワード変更",
377376
"check": "バックアップの確認",
378377
"continue": "続行",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "銀行振込",
400399
"bestDeal": "最良の取引",
400+
"buy": "買う",
401401
"creditCard": "クレジットカード",
402402
"fast": "高速",
403403
"fee": "手数料",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "申し訳ございませんが、この地域では利用可能な取引所はございません。",
461461
"region": "地域",
462-
"selectRegion": "指定なし"
462+
"selectRegion": "指定なし",
463+
"sell": "売る"
463464
},
464465
"info": {
465466
"continue": "同意して続ける",

Diff for: frontends/web/src/locales/ms/app.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Tinggalkan",
374374
"back": "Kembali",
375-
"buy": "Beli",
376375
"changepin": "Ubah kata laluan peranti",
377376
"check": "Semak Backup",
378377
"continue": "Teruskan",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Transfer bank",
400399
"bestDeal": "Tawaran terbaik",
400+
"buy": "Beli",
401401
"creditCard": "Kad kredit",
402402
"fast": "Cepat",
403403
"fee": "bayaran",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Maaf, tiada pertukaran tersedia di rantau ini.",
461461
"region": "Wilayah",
462-
"selectRegion": "Tidak dinyatakan"
462+
"selectRegion": "Tidak dinyatakan",
463+
"sell": "jual"
463464
},
464465
"info": {
465466
"continue": "Setuju dan teruskan",

Diff for: frontends/web/src/locales/nl/app.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Annuleren",
374374
"back": "Terug",
375-
"buy": "Koop",
376375
"changepin": "BitBox-wachtwoord veranderen",
377376
"check": "Backup controleren",
378377
"continue": "Verder",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Bankoverschrijving",
400399
"bestDeal": "Beste deal",
400+
"buy": "Kopen",
401401
"creditCard": "Creditcard",
402402
"fast": "Snel",
403403
"fee": "transactiekosten",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Sorry, er zijn geen exchanges beschikbaar in jouw regio",
461461
"region": "Regio",
462-
"selectRegion": "Niet aangegeven"
462+
"selectRegion": "Niet aangegeven",
463+
"sell": "Verkopen"
463464
},
464465
"info": {
465466
"continue": "Akkoord, verder",

Diff for: frontends/web/src/locales/pt/app.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Abortar",
374374
"back": "Voltar",
375-
"buy": "Comprar",
376375
"changepin": "Mudar senha do dispositivo",
377376
"check": "Checar backup",
378377
"continue": "Continuar",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Transferência bancária",
400399
"bestDeal": "Melhor oferta",
400+
"buy": "Comprar",
401401
"creditCard": "Cartão de crédito",
402402
"fast": "Rápido",
403403
"fee": "taxa",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Desculpe, não há exchanges disponíveis nesta região.",
461461
"region": "Região",
462-
"selectRegion": "Não especificada"
462+
"selectRegion": "Não especificada",
463+
"sell": "Vender"
463464
},
464465
"info": {
465466
"continue": "Concordo e continue",

Diff for: frontends/web/src/locales/ru/app.json

-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@
276276
"button": {
277277
"abort": "Прервать",
278278
"back": "Назад",
279-
"buy": "Купить",
280279
"changepin": "Изменить пароль устройства",
281280
"check": "Проверить резервную копию",
282281
"continue": "Продолжить",

Diff for: frontends/web/src/locales/sl/app.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Prekini",
374374
"back": "Nazaj",
375-
"buy": "Kupi",
376375
"changepin": "Spremenite geslo naprave",
377376
"check": "Preverite varnostno kopijo",
378377
"continue": "Nadaljujte",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Bančno nakazilo",
400399
"bestDeal": "Najboljša ponudba",
400+
"buy": "Nakup",
401401
"creditCard": "Kreditna karica",
402402
"fast": "Hitro",
403403
"fee": "provizija",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "V tej regiji žal ni razpoložljivih menjalnic.",
461461
"region": "Regija",
462-
"selectRegion": "Ni navedeno"
462+
"selectRegion": "Ni navedeno",
463+
"sell": "Prodaja"
463464
},
464465
"info": {
465466
"continue": "Potrdi in nadaljuj",

Diff for: frontends/web/src/routes/account/account.module.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
.actionsContainer {
2424
display: flex;
25+
flex-wrap: nowrap;
2526
transform: translateY(-36%);
2627
margin-top: calc(var(--space-quarter) * 2);
2728
padding-bottom: 14px;
@@ -31,17 +32,18 @@
3132
.receive,
3233
.walletConnect,
3334
.send {
35+
align-items: center;
3436
background-color: var(--color-blue);
3537
border-radius: 2px;
3638
color: var(--color-alt);
37-
display: inline-block;
39+
display: inline-flex;
3840
font-size: var(--size-default);
39-
height: calc(var(--item-height) / 1.5);
40-
line-height: calc(var(--item-height) / 1.5);
41+
justify-content: center;
4142
margin-bottom: var(--space-quarter);
4243
margin-left: var(--space-quarter);
44+
min-height: calc(var(--item-height) / 1.5);
4345
min-width: calc(var(--item-height) * 2);
44-
padding: 0 var(--space-half);
46+
padding: var(--space-quarter) var(--space-half);
4547
text-align: center;
4648
text-decoration: none;
4749
transition: background-color ease-out 0.2s;
@@ -54,7 +56,6 @@
5456
}
5557

5658
.withWalletConnect.actionsContainer {
57-
flex-wrap: wrap;
5859
justify-content: flex-end;
5960
}
6061

@@ -82,7 +83,6 @@
8283

8384
@media (max-width: 768px) {
8485
.actionsContainer {
85-
flex-wrap: wrap;
8686
justify-content: space-between;
8787
margin-bottom: var(--space-default);
8888
margin-left: auto;

0 commit comments

Comments
 (0)