rebase pr

planetdecred · May 24, 2022 · 4b92a39 · 4b92a39
1 parent e82085d
commit 4b92a39
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/ui/modal/create_watch_only_modal.go b/ui/modal/create_watch_only_modal.go
@@ -132,11 +132,11 @@ func (cm *CreateWatchOnlyModal) Handle() {
 
 	for (cm.btnPositve.Clicked() || isSubmit) && cm.isEnabled {
 		if cm.walletNameEnabled {
-		if !editorsNotEmpty(cm.walletName.Editor) {
-			cm.walletName.SetError(values.String(values.StrEnterWalletName))
-			return
+			if !editorsNotEmpty(cm.walletName.Editor) {
+				cm.walletName.SetError(values.String(values.StrEnterWalletName))
+				return
+			}
 		}
-	}
 
 		if !editorsNotEmpty(cm.extendedPubKey.Editor) {
 			cm.extendedPubKey.SetError(values.String(values.StrEnterExtendedPubKey))

diff --git a/ui/modal/info_modal.go b/ui/modal/info_modal.go
@@ -50,7 +50,6 @@ func NewInfoModal(l *load.Load) *InfoModal {
 		modal:        *l.Theme.ModalFloatTitle(),
 		btnPositve:   l.Theme.OutlineButton(values.String(values.StrYes)),
 		btnNegative:  l.Theme.OutlineButton(values.String(values.StrNo)),
-		keyEvent:     make(chan *key.Event),
 		isCancelable: true,
 		btnAlignment: layout.E,
 	}

diff --git a/ui/page/start_page.go b/ui/page/start_page.go
@@ -32,8 +32,8 @@ func NewStartPage(l *load.Load) load.Page {
 		loading: true,
 
 		watchOnlyWalletButton: l.Theme.Button(values.String(values.StrImportWatchingOnlyWallet)),
-		createButton:  l.Theme.Button(values.String(values.StrCreateANewWallet)),
-		restoreButton: l.Theme.Button(values.String(values.StrRestoreExistingWallet)),
+		createButton:          l.Theme.Button(values.String(values.StrCreateANewWallet)),
+		restoreButton:         l.Theme.Button(values.String(values.StrRestoreExistingWallet)),
 	}
 
 	return sp