change method change page in security tool

refactor code in security tool

fix conflict

ui/page.go

@@ -32,11 +32,8 @@ type pageIcons struct {
 	pendingIcon, logo, redirectIcon, confirmIcon, newWalletIcon, walletAlertIcon,
 	importedAccountIcon, accountIcon, editIcon, expandIcon, collapseIcon, copyIcon, mixer,
 	arrowFowardIcon, transactionFingerPrintIcon, settingsIcon, securityIcon, helpIcon,
-<<<<<<< HEAD
-	aboutIcon, debugIcon, alert, verifyMessageIcon, locationPinIcon, alertGray, arrowDownIcon *widget.Image
-=======
-	aboutIcon, debugIcon, alert, verifyMessageIcon, locationPinIcon, checkMarkGreenIcon, crossMarkRed *widget.Image
->>>>>>> Create layout and logic for validate address page
+	aboutIcon, debugIcon, alert, verifyMessageIcon, locationPinIcon, alertGray, arrowDownIcon,
+	checkMarkGreenIcon, crossMarkRed *widget.Image
 
 	walletIcon, syncingIcon image.Image
 }
@@ -83,8 +80,8 @@ type pageCommon struct {
 	subPageBackButton decredmaterial.IconButton
 	subPageInfoButton decredmaterial.IconButton
 
-	changePage         func(string)
-	pushNavigationPage func(string)
+	changePage    func(string)
+	setReturnPage func(string)
 }
 
 type (
@@ -250,7 +247,7 @@ func (win *Window) addPages(decredIcons map[string]image.Image) {
 		subPageBackButton:       win.theme.PlainIconButton(new(widget.Clickable), ic.navigationArrowBack),
 		subPageInfoButton:       win.theme.PlainIconButton(new(widget.Clickable), ic.actionInfo),
 		changePage:              win.changePage,
-		pushNavigationPage:      win.pushNavigationPage,
+		setReturnPage:           win.setReturnPage,
 	}
 
 	common.testButton = win.theme.Button(new(widget.Clickable), "test button")
@@ -296,16 +293,6 @@ func (page pageCommon) ChangePage(pg string) {
 	page.changePage(pg)
 }
 
-func (page pageCommon) PushNavigationPage(from, to string) {
-	page.returnPage = &from
-	page.pushNavigationPage(from)
-	page.changePage(to)
-}
-
-func (page pageCommon) PopNavigationPage() {
-	page.changePage(*page.returnPage)
-}
-
 func (page pageCommon) Notify(text string, success bool) {
 	go func() {
 		page.toast <- &toast{

ui/security_tools_page.go

@@ -107,10 +107,14 @@ func (pg *securityToolsPage) pageSections(gtx layout.Context, icon *widget.Image
 
 func (pg *securityToolsPage) handle(common pageCommon) {
 	if pg.verifyMessage.Clicked() {
-		common.PushNavigationPage(PageSecurityTools, PageVerifyMessage)
+		*common.returnPage = PageSecurityTools
+		common.setReturnPage(PageSecurityTools)
+		common.changePage(PageVerifyMessage)
 	}
 
 	if pg.validateAddress.Clicked() {
-		common.PushNavigationPage(PageSecurityTools, ValidateAddress)
+		*common.returnPage = PageSecurityTools
+		common.setReturnPage(PageSecurityTools)
+		common.changePage(ValidateAddress)
 	}
 }

ui/validate_address.go

@@ -11,13 +11,13 @@ import (
 	"github.com/planetdecred/godcr/wallet"
 )
 
-const ValidateAddress = "Validate Address"
+const ValidateAddress = "ValidateAddress"
 
 const (
-	none     = 0
-	valid    = 1
-	invalid  = 2
-	notOwned = 3
+	none = iota
+	valid
+	invalid
+	notOwned
 )
 
 type validateAddressPage struct {
@@ -68,7 +68,7 @@ func (pg *validateAddressPage) Layout(gtx layout.Context, common pageCommon) lay
 		page := SubPage{
 			title: ValidateAddress,
 			back: func() {
-				common.PopNavigationPage()
+				common.changePage(*common.returnPage)
 			},
 			body: func(gtx C) D {
 				return layout.Inset{Top: values.MarginPadding5}.Layout(gtx, func(gtx C) D {

ui/verify_message_page.go

@@ -47,13 +47,17 @@ func (win *Window) VerifyMessagePage(c pageCommon) layout.Widget {
 }
 
 func (pg *verifyMessagePage) Layout(gtx layout.Context, c pageCommon) layout.Dimensions {
+	var walletName = c.info.Wallets[*c.selectedWallet].Name
+	if *c.returnPage == PageSecurityTools {
+		walletName = ""
+	}
 	body := func(gtx C) D {
 		load := SubPage{
 			title:      "Verify message",
-			walletName: c.info.Wallets[*c.selectedWallet].Name,
+			walletName: walletName,
 			back: func() {
 				pg.clearInputs(&c)
-				c.PopNavigationPage()
+				c.changePage(*c.returnPage)
 			},
 			body: func(gtx layout.Context) layout.Dimensions {
 				return pg.theme.Card().Layout(gtx, func(gtx C) D {

ui/wallet_page.go

@@ -574,7 +574,9 @@ func (pg *walletPage) Handle(common pageCommon) {
 		if pg.optionsMenuItems[index].button.Clicked() {
 			pg.openPopupIndex = -1
 			if index == 1 {
-				common.PushNavigationPage(PageWallet, PageVerifyMessage)
+				*common.returnPage = PageWallet
+				common.setReturnPage(PageWallet)
+				common.changePage(PageVerifyMessage)
 			}
 			common.ChangePage(pg.optionsMenuItems[index].page)
 		}

ui/window.go

@@ -117,7 +117,7 @@ func (win *Window) changePage(page string) {
 	win.window.Invalidate()
 }
 
-func (win *Window) pushNavigationPage(from string) {
+func (win *Window) setReturnPage(from string) {
 	win.previous = from
 	win.window.Invalidate()
 }