review changes

Signed-off-by: Philemon Ukane <[email protected]>
ukane-philemon · Feb 1, 2024 · 3f8bc94 · 3f8bc94
1 parent cd4d8ee
commit 3f8bc94
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/ui/page/root/home_page.go b/ui/page/root/home_page.go
@@ -220,7 +220,7 @@ func (hp *HomePage) initDEX() {
 		dexPassEditor := hp.Theme.EditorPassword(new(widget.Editor), values.String(values.StrDexPassword))
 		dexPassEditor.Editor.SingleLine, dexPassEditor.IsRequired = true, true
 
-		showWalletToSyncModal := func() {
+		showWalletsToSyncModal := func() {
 			// DEX client has active orders or expired bonds, retrieve the
 			// wallets involved and ensure they are synced or syncing.
 			walletsToSyncMap := make(map[uint32]*struct{})
@@ -235,7 +235,7 @@ func (hp *HomePage) initDEX() {
 				walletsToSyncMap[bond.AssetID] = &struct{}{}
 			}
 
-			var walletsToSyncStr string
+			var namesOfWalletsToSync []string
 			var walletsToSync []sharedW.Asset
 			for assetID := range walletsToSyncMap {
 				walletID, err := dexClient.WalletIDForAsset(assetID)
@@ -259,7 +259,7 @@ func (hp *HomePage) initDEX() {
 				}
 
 				walletsToSync = append(walletsToSync, wallet)
-				walletsToSyncStr += "," + fmt.Sprintf("%s (%s)", wallet.GetWalletName(), wallet.GetAssetType())
+				namesOfWalletsToSync = append(namesOfWalletsToSync, fmt.Sprintf("%s (%s)", wallet.GetWalletName(), wallet.GetAssetType()))
 			}
 
 			if len(walletsToSync) == 0 {
@@ -268,7 +268,7 @@ func (hp *HomePage) initDEX() {
 
 			walletSyncRequestModal := modal.NewCustomModal(hp.Load).
 				Title(values.String(values.StrWalletsNeedToSync)).
-				Body(values.StringF(values.StrWalletsNeedToSyncMsg, strings.Trim(walletsToSyncStr, ","))).
+				Body(values.StringF(values.StrWalletsNeedToSyncMsg, strings.Join(namesOfWalletsToSync, ", "))).
 				SetNegativeButtonText(values.String(values.StrIWillSyncLater)).
 				SetPositiveButtonText(values.String(values.StrOkaySync)).
 				SetPositiveButtonCallback(func(isChecked bool, im *modal.InfoModal) bool {
@@ -287,7 +287,6 @@ func (hp *HomePage) initDEX() {
 						}
 					}
 
-					hp.ParentWindow().Reload()
 					return true
 				}).SetCancelable(false)
 			hp.ParentWindow().ShowModal(walletSyncRequestModal)
@@ -304,10 +303,9 @@ func (hp *HomePage) initDEX() {
 					}),
 				)
 			}).
-			SetNegativeButtonText(values.String(values.StrLoginLater)).
-			NegativeButtonStyle(hp.Theme.Color.OrangeRipple, hp.Theme.Color.Surface).
+			SetNegativeButtonText(values.String(values.StrIWillLoginLater)).
 			SetNegativeButtonCallback(func() {
-				showWalletToSyncModal()
+				showWalletsToSyncModal()
 			}).
 			SetPositiveButtonText(values.String(values.StrLogin)).
 			SetPositiveButtonCallback(func(isChecked bool, im *modal.InfoModal) bool {
@@ -318,7 +316,7 @@ func (hp *HomePage) initDEX() {
 					return false
 				}
 
-				showWalletToSyncModal()
+				showWalletsToSyncModal()
 				return true
 			}).
 			SetCancelable(false)

diff --git a/ui/values/localizable/en.go b/ui/values/localizable/en.go
@@ -925,10 +925,10 @@ const EN = `
 "walletsNeedToSync" = "Wallet(s) need to sync"
 "walletsNeedToSyncMsg" = "The following wallet(s) used by the DEX client needs to sync to settle active trade(s) or refund expired bonds: %s"
 "iWillSyncLater" = "I'll sync later"
+"iWillLoginLater" = "I'll login later"
 "okaySync" = "Okay, sync"
 "paste" = "Paste"
 "backupDEXSeed" = "Backup DEX Seed"
 "dexSeed" = "DEX Seed"
 "optionalRestorationSeed" = "Restoration Seed (optional)"
-"loginLater" = "I'll login later"
 `
diff --git a/ui/values/strings.go b/ui/values/strings.go
@@ -1033,12 +1033,12 @@ const (
 	StrWalletsNeedToSync               = "walletsNeedToSync"
 	StrWalletsNeedToSyncMsg            = "walletsNeedToSyncMsg"
 	StrIWillSyncLater                  = "iWillSyncLater"
+	StrIWillLoginLater                 = "iWillLoginLater"
 	StrOkaySync                        = "okaySync"
 	StrPaste                           = "paste"
 	StrBackupDEXSeed                   = "backupDEXSeed"
 	StrDEXSeed                         = "dexSeed"
 	StrOptionalRestorationSeed         = "optionalRestorationSeed"
-	StrLoginLater                      = "loginLater"
 
 	StrLoginDEXForActiveOrdersOrExpiredBonds = "loginDEXForActiveOrdersOrExpiredBonds"
 )