backend/accounts: do not reload current keystore's accounts

When doing a soft-reload, we do not need to unload and reload the
accounts that belong to the current keystore - we can just leave them
as is to speed things up.

Without this, when disabling watch-only while a keystore is connected,
all accounts would be unloaded and the keystore's accounts loaded
again. With this, the keystore's accounts are not unloaded.

Author: benma

backend/accounts.go

@@ -1104,7 +1104,18 @@ func (backend *Backend) uninitAccounts(force bool) {
 	keep := []accounts.Interface{}
 	for _, account := range backend.accounts {
 		account := account
-		if !force && account.Config().Config.IsWatch() {
+
+		belongsToKeystore := false
+		if backend.keystore != nil {
+			fingerprint, err := backend.keystore.RootFingerprint()
+			if err != nil {
+				backend.log.WithError(err).Error("could not retrieve keystore fingerprint")
+			} else {
+				belongsToKeystore = account.Config().Config.SigningConfigurations.ContainsRootFingerprint(fingerprint)
+			}
+		}
+
+		if !force && (belongsToKeystore || account.Config().Config.IsWatch(backend.config.AppConfig().Backend.Watchonly)) {
 			// Do not uninit/remove account that is being watched.
 			keep = append(keep, account)
 			continue

frontends/web/src/routes/settings/manage-accounts.tsx

@@ -106,7 +106,7 @@ class ManageAccounts extends Component<Props, State> {
                 .then(() => event.target.disabled = false);
             }} />
           { watchonly ? (<>
-            Hide account:
+            Hide account (TODO: move this to the edit dialog):
             <Toggle
               checked={!account.watch}
               className={style.toggle}