AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9076 from SomberNight/202405_android_config_pin

Browse Source 
qml: "wallet_else_pin" auth should only use the wallet pw if is unified
This commit is contained in:
accumulator
2024-05-31 11:14:50 +02:00
committed by GitHub
parent db5f1a11a5 11614f035d
commit 15f13ebc66
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/gui/qml/components/main.qml
View File

@@ -631,11 +631,12 @@ ApplicationWindow
console.log('auth using method ' + method) console.log('auth using method ' + method)
if (method == 'wallet_else_pin') { if (method == 'wallet_else_pin') {
// if no wallet loaded, delegate to pin auth, else use wallet password auth // if there is a loaded wallet and all wallets use the same password, use that
if (!Daemon.currentWallet) { // else delegate to pin auth
method = 'pin' if (Daemon.currentWallet && Daemon.singlePasswordEnabled) {
} else {
method = 'wallet' method = 'wallet'
} else {
method = 'pin'
} }
} }