refactor ad improve UI changes

Signed-off-by: Philemon Ukane <[email protected]>
crypto-power · Oct 27, 2023 · f89d9a9 · f89d9a9
1 parent 67aff86
commit f89d9a9
Show file tree

Hide file tree

Showing 3 changed files with 191 additions and 242 deletions.
diff --git a/ui/cryptomaterial/dropdown.go b/ui/cryptomaterial/dropdown.go
@@ -317,9 +317,8 @@ func (d *DropDown) closedLayout(gtx C, iLeft int, iRight int) D {
 					if len(d.items) == 0 {
 						if d.extraDisplay != nil {
 							return d.extraDisplay(gtx)
-						} else {
-							return D{}
 						}
+						return D{}
 					}
 					return d.layoutOption(gtx, d.selectedIndex)
 				}))

diff --git a/ui/page/dcrdex/dex_onboarding_page.go b/ui/page/dcrdex/dex_onboarding_page.go
@@ -5,7 +5,6 @@ import (
 	"image"
 	"image/color"
 	"strconv"
-	"time"
 
 	"gioui.org/font"
 	"gioui.org/layout"
@@ -112,8 +111,6 @@ type DEXOnboarding struct {
 	materialLoader material.LoaderStyle
 	showLoader     bool
 	isLoading      bool
-
-	redirected bool // TODO: Remove
 }
 
 func NewDEXOnboarding(l *load.Load) *DEXOnboarding {
@@ -742,7 +739,7 @@ func (pg *DEXOnboarding) stepWaitForBondConfirmation(gtx C) D {
 					layout.Flexed(0.33, func(gtx C) D {
 						return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 							layout.Rigid(func(gtx C) D {
-								return layout.Inset{Bottom: 5}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+								return layout.Inset{Bottom: 5}.Layout(gtx, func(gtx C) D {
 									return semiBoldLabelGrey3(pg.Theme, gtx, values.String(values.StrNewTier))
 								})
 							}),
@@ -754,7 +751,7 @@ func (pg *DEXOnboarding) stepWaitForBondConfirmation(gtx C) D {
 					layout.Flexed(0.33, func(gtx C) D {
 						return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 							layout.Rigid(func(gtx C) D {
-								return layout.Inset{Bottom: 5}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+								return layout.Inset{Bottom: 5}.Layout(gtx, func(gtx C) D {
 									return semiBoldLabelGrey3(pg.Theme, gtx, values.String(values.StrBondStrength))
 								})
 							}),
@@ -766,7 +763,7 @@ func (pg *DEXOnboarding) stepWaitForBondConfirmation(gtx C) D {
 					layout.Flexed(0.33, func(gtx C) D {
 						return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 							layout.Rigid(func(gtx C) D {
-								return layout.Inset{Bottom: 5}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+								return layout.Inset{Bottom: 5}.Layout(gtx, func(gtx C) D {
 									return semiBoldLabelGrey3(pg.Theme, gtx, values.String(values.StrTotalCost))
 								})
 							}),
@@ -935,19 +932,11 @@ func (pg *DEXOnboarding) HandleUserInteractions() {
 			hasEnough := pg.bondAccountHasEnough()
 			bondStrengthOk := pg.validateBondStrength()
 			if !hasEnough || !bondStrengthOk {
-				// return
+				return
 			}
 
 			// TODO: Post bond, wait for confirmations and redirect to market page.
 			pg.currentStep = onBoardingStepWaitForConfirmation
-			if !pg.redirected {
-				pg.redirected = true
-				log.Info("Redirecting to market page...")
-				time.AfterFunc(5*time.Second, func() {
-					pg.ParentNavigator().ClearStackAndDisplay(NewDEXMarketPage(pg.Load))
-				})
-			}
-
 			// Scroll to the top of the confirmation page after leaving the long
 			// post bond form.
 			pg.scrollContainer.Position.Offset = 0