fix rebase issues

Signed-off-by: Philemon Ukane <[email protected]>

ui/modal/info_modal.go

@@ -298,9 +298,13 @@ func (in *InfoModal) Handle() {
 			isChecked = in.checkbox.CheckBox.Value
 		}
 
-		if in.positiveButtonClicked(isChecked, in) {
-			in.Dismiss()
-		}
+		in.SetLoading(true)
+		go func() {
+			if in.positiveButtonClicked(isChecked, in) {
+				in.Dismiss()
+			}
+			in.SetLoading(false)
+		}()
 	}
 
 	for in.btnNegative.Clicked() {

ui/page/root/home_page.go

@@ -154,10 +154,7 @@ func (hp *HomePage) OnNavigatedTo() {
 	hp.initDEX()
 
 	go hp.CalculateAssetsUSDBalance()
-	if !hp.AssetsManager.DEXCInitialized() {
-		go hp.AssetsManager.InitializeDEX(hp.dexCtx)
-	}
-
+
 	if hp.CurrentPage() == nil {
 		hp.Display(NewOverviewPage(hp.Load, hp.showNavigationFunc))
 	}

ui/values/localizable/en.go

@@ -377,7 +377,7 @@ const EN = `
 "noActiveTickets" = "No active tickets"
 "noAgendaYet" = "No agendas yet"
 "noConnectedPeer" = "no connected peers."
-"noExchangeOnTestnet" = "Exchange functionality is not available on the test network""
+"noExchangeOnTestnet" = "Exchange functionality is not available on the test network"
 "noInternet" = "no Internet Connectivity."
 "nonAccSelector" = "This widget isn't set to show accounts"
 "none" = "None"
@@ -908,7 +908,7 @@ const EN = `
 "iWillGet" = "I'll get"
 "iWillGive" = "I'll give"
 "noSupportedMarketMsg" = "Oops, there are no supported market at the moment. Please choose another server."
-"postBondMsg" = ""You have zero effective tiers. Please post bonds to trade."
+"postBondMsg" = "You have zero effective tiers. Please post bonds to trade."
 "bondPostingInProgressMsg" = "You have zero effective tiers but bond posting is in progress. Please ensure your %s(%s) wallet account %s is funded with at least %s and is syncing."
 "maxDEX" = "Max %s: %s"
 "availableBalance" = "Available Balance: %s"