Skip to content

Commit fb319a4

Browse files
committed
Merge branch 'ethLock' into release-v4.50.1
2 parents 1ca6427 + ffe2bfa commit fb319a4

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

APP_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.50.0
1+
4.50.1

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
## Unreleased
44
- iOS: Add haptic feedback on account summary chart scrolls
55

6+
## v4.50.1
7+
- Fix a bug that would delay showing watch-only accounts.
8+
69
## v4.50.0
710
- Bundle BitBox02 Nova firmware version v9.25.0
811
- Add a dropdown on the "Receiver address" input in the send screen to select an account

backend/backend.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,11 +563,10 @@ func (backend *Backend) Coin(code coinpkg.Code) (coinpkg.Coin, error) {
563563
}
564564

565565
func (backend *Backend) updateETHAccounts() error {
566-
defer backend.accountsAndKeystoreLock.RLock()()
567566
backend.log.Debug("Updating ETH accounts balances")
568567

569568
accountsChainID := map[string][]*eth.Account{}
570-
for _, account := range backend.accounts {
569+
for _, account := range backend.Accounts() {
571570
ethAccount, ok := account.(*eth.Account)
572571
if ok {
573572
chainID := ethAccount.ETHCoin().ChainIDstr()

frontends/android/BitBoxApp/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
// minSdkVersion should match the `-androidapi` gomobile bind flag
1818
// in backend/mobileserver/Makefile
1919
targetSdkVersion 35
20-
versionCode 67
20+
versionCode 68
2121
versionName "${appVersion}"
2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2323
externalNativeBuild {

frontends/ios/BitBoxApp/Config.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
// Build number, increment this for every separate publication,
88
// even if the app version is the same.
9-
CURRENT_PROJECT_VERSION = 15
9+
CURRENT_PROJECT_VERSION = 16

0 commit comments

Comments
 (0)