DEX create password, DCR wallet and add server

go.mod

@@ -3,6 +3,7 @@ module github.com/planetdecred/godcr
 go 1.16
 
 require (
+	decred.org/dcrdex v0.0.0-20211109012459-ce823c3315bc
 	gioui.org v0.0.0-20211011183043-05f0f5c20f45
 	github.com/JohannesKaufmann/html-to-markdown v1.2.1
 	github.com/PuerkitoBio/goquery v1.6.1
@@ -21,12 +22,10 @@ require (
 	github.com/nxadm/tail v1.4.4
 	github.com/onsi/ginkgo v1.14.0
 	github.com/onsi/gomega v1.10.1
-	github.com/planetdecred/dcrlibwallet v1.6.2-0.20211019025657-3c6b25766450
+	github.com/planetdecred/dcrlibwallet v1.6.2-0.20211208155954-3ba1589ff83f
 	github.com/yeqown/go-qrcode v1.5.1
 	golang.org/x/exp v0.0.0-20210722180016-6781d3edade3
 	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
 	golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 // indirect
 	golang.org/x/text v0.3.7
 )
-
-replace github.com/decred/dcrdata/txhelpers/v4 => github.com/decred/dcrdata/txhelpers/v4 v4.0.0-20200108145420-f82113e7e212

main.go

@@ -65,7 +65,7 @@ func main() {
 
 	win, appWindow, err := ui.CreateWindow(wal)
 	if err != nil {
-		fmt.Printf("Could not initialize window: %s\ns", err)
+		log.Errorf("Could not initialize window: %s\ns", err)
 		return
 	}
 

ui/load/load.go

@@ -59,6 +59,8 @@ type Icons struct {
 	TicketExpiredIcon,
 	TicketRevokedIcon,
 	TicketUnminedIcon *decredmaterial.Image
+
+	DexIcon, DexIconInactive, BTC, DCR *decredmaterial.Image
 }
 
 type Load struct {
@@ -115,6 +117,7 @@ func NewLoad() (*Load, error) {
 	if th == nil {
 		return nil, errors.New("unexpected error while loading theme")
 	}
+
 	l := &Load{
 		Theme:    th,
 		Icons:    icons,
@@ -134,6 +137,9 @@ func (l *Load) RefreshTheme() {
 	l.Theme.SwitchDarkMode(isDarkModeOn, assets.DecredIcons)
 	l.RefreshWindow()
 }
+func (l *Load) Dexc() *dcrlibwallet.DexClient {
+	return l.WL.MultiWallet.DexClient()
+}
 
 func loadIcons() Icons {
 	decredIcons := assets.DecredIcons
@@ -222,6 +228,11 @@ func loadIcons() Icons {
 		GovernanceInactiveIcon:   decredmaterial.NewImage(decredIcons["governance_inactive"]),
 		LogoDarkMode:             decredmaterial.NewImage(decredIcons["logo_darkmode"]),
 		TimerDarkMode:            decredmaterial.NewImage(decredIcons["timer_dm"]),
+
+		DexIcon:         decredmaterial.NewImage(decredIcons["dex_icon"]),
+		DexIconInactive: decredmaterial.NewImage(decredIcons["dex_icon_inactive"]),
+		BTC:             decredmaterial.NewImage(decredIcons["dex_btc"]),
+		DCR:             decredmaterial.NewImage(decredIcons["dex_dcr"]),
 	}
 	return ic
 }

ui/modal/create_password_modal.go

@@ -37,6 +37,7 @@ type CreatePasswordModal struct {
 	dialogTitle string
 	randomID    string
 	serverError string
+	description string
 
 	materialLoader material.LoaderStyle
 
@@ -142,6 +143,11 @@ func (cm *CreatePasswordModal) SetCancelable(min bool) *CreatePasswordModal {
 	return cm
 }
 
+func (cm *CreatePasswordModal) SetDescription(description string) *CreatePasswordModal {
+	cm.description = description
+	return cm
+}
+
 func (cm *CreatePasswordModal) SetError(err string) {
 	cm.serverError = err
 }
@@ -250,6 +256,12 @@ func (cm *CreatePasswordModal) Layout(gtx layout.Context) D {
 			t.Font.Weight = text.SemiBold
 			return t.Layout(gtx)
 		},
+		func(gtx C) D {
+			if cm.description != "" {
+				return cm.Theme.Body2(cm.description).Layout(gtx)
+			}
+			return layout.Dimensions{}
+		},
 		func(gtx C) D {
 			if cm.serverError != "" {
 				t := cm.Theme.Body2(cm.serverError)
@@ -258,7 +270,6 @@ func (cm *CreatePasswordModal) Layout(gtx layout.Context) D {
 			}
 			return layout.Dimensions{}
 		},
-
 		func(gtx C) D {
 			if cm.walletNameEnabled {
 				return cm.walletName.Layout(gtx)

ui/modal/password_modal.go

@@ -23,6 +23,7 @@ type PasswordModal struct {
 	password decredmaterial.Editor
 
 	dialogTitle string
+	description string
 
 	isLoading    bool
 	isCancelable bool
@@ -87,6 +88,11 @@ func (pm *PasswordModal) Title(title string) *PasswordModal {
 	return pm
 }
 
+func (pm *PasswordModal) Description(description string) *PasswordModal {
+	pm.description = description
+	return pm
+}
+
 func (pm *PasswordModal) Hint(hint string) *PasswordModal {
 	pm.password.Hint = hint
 	return pm
@@ -167,6 +173,11 @@ func (pm *PasswordModal) Layout(gtx layout.Context) D {
 		return t.Layout(gtx)
 	}
 
+	description := func(gtx C) D {
+		t := pm.Theme.Body2(pm.description)
+		return t.Layout(gtx)
+	}
+
 	editor := func(gtx C) D {
 		return pm.password.Layout(gtx)
 	}
@@ -200,6 +211,7 @@ func (pm *PasswordModal) Layout(gtx layout.Context) D {
 	var w []layout.Widget
 
 	w = append(w, title)
+	w = append(w, description)
 	w = append(w, editor)
 	w = append(w, actionButtons)
 

ui/page/components/components.go

@@ -663,3 +663,14 @@ func TranslateErr(err error) string {
 
 	return err.Error()
 }
+
+// CoinImageBySymbol returns image widget for supported asset coins.
+func CoinImageBySymbol(icons *load.Icons, coinName string) *decredmaterial.Image {
+	switch strings.ToLower(coinName) {
+	case "btc":
+		return icons.BTC
+	case "dcr":
+		return icons.DCR
+	}
+	return nil
+}

ui/page/debug_page.go

@@ -2,8 +2,10 @@ package page
 
 import (
 	"gioui.org/layout"
+
 	"github.com/planetdecred/godcr/ui/decredmaterial"
 	"github.com/planetdecred/godcr/ui/load"
+	"github.com/planetdecred/godcr/ui/modal"
 	"github.com/planetdecred/godcr/ui/page/components"
 	"github.com/planetdecred/godcr/ui/values"
 )
@@ -49,6 +51,14 @@ func NewDebugPage(l *load.Load) *DebugPage {
 	}
 	pg.list.Radius = decredmaterial.Radius(14)
 
+	// Add a "Reset DEX Client" option.
+	pg.debugItems = append(pg.debugItems, debugItem{
+		text: "Reset DEX Client",
+		action: func() {
+			pg.resetDexData()
+		},
+	})
+
 	pg.backButton, _ = components.SubpageHeaderButtons(l)
 
 	return pg
@@ -129,3 +139,19 @@ func (pg *DebugPage) Layout(gtx C) D {
 	}
 	return components.UniformPadding(gtx, container)
 }
+
+func (pg *DebugPage) resetDexData() {
+	// Show confirm modal before resetting dex client data.
+	confirmModal := modal.NewInfoModal(pg.Load).
+		Title("Confirm DEX Client Reset").
+		Body("You may need to restart godcr before you can use the DEX again. Proceed?").
+		NegativeButton(values.String(values.StrCancel), func() {}).
+		PositiveButton("Reset DEX Client", func() {
+			if pg.Dexc().Reset() {
+				pg.Toast.Notify("DEX client data reset complete.")
+			} else {
+				pg.Toast.NotifyError("DEX client data reset failed. Check the logs.")
+			}
+		})
+	pg.ShowModal(confirmModal)
+}