rebase pr

fix lint on testApp.go
planetdecred · Dec 14, 2020 · 7f4221b · 7f4221b
1 parent 2908f4a
commit 7f4221b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/ui/account_info_page.go b/ui/account_info_page.go
@@ -20,7 +20,6 @@ type acctDetailsPage struct {
 	acctDetailsPageContainer layout.List
 	backButton               decredmaterial.IconButton
 	acctInfo                 **wallet.Account
-	infoBtn                  decredmaterial.IconButton
 	line                     *decredmaterial.Line
 	editAccount              *widget.Clickable
 }
@@ -64,7 +63,7 @@ func (pg *acctDetailsPage) Layout(gtx layout.Context, common pageCommon) layout.
 			})
 		},
 		func(gtx C) D {
-			return pg.accountInfoLayout(gtx, &common)
+			return pg.accountInfoLayout(gtx)
 		},
 	}
 
@@ -192,7 +191,7 @@ func (pg *acctDetailsPage) accountBalanceLayout(gtx layout.Context, common *page
 	})
 }
 
-func (pg *acctDetailsPage) accountInfoLayout(gtx layout.Context, common *pageCommon) layout.Dimensions {
+func (pg *acctDetailsPage) accountInfoLayout(gtx layout.Context) layout.Dimensions {
 	acctInfoLayout := func(gtx layout.Context, leftText, rightText string) layout.Dimensions {
 		return layout.Flex{}.Layout(gtx,
 			layout.Rigid(func(gtx C) D {

diff --git a/ui/test/testapp.go b/ui/test/testapp.go
@@ -109,7 +109,7 @@ func (t *TestStruct) initWidgets() {
 	t.customEditorOutput.outline = theme.Outline()
 	// t.customEditorOutput.outline.Color = theme.Color.Primary
 
-	t.collapsible = theme.Collapsible()
+	t.collapsible = theme.Collapsible(nil)
 
 	dropDownItems := []decredmaterial.DropDownItem{
 		{
@@ -211,7 +211,7 @@ func (t *TestStruct) testPageContents(gtx layout.Context) layout.Dimensions {
 					}),
 				)
 			}
-			return t.collapsible.Layout(gtx, header, content)
+			return t.collapsible.Layout(gtx, header, content, nil)
 		},
 
 		func(gtx C) D {

diff --git a/ui/wallet_page.go b/ui/wallet_page.go
@@ -1,7 +1,6 @@
 package ui
 
 import (
-	// "fmt"
 	"image"
 	"image/color"
 	"strings"
@@ -30,8 +29,6 @@ type moreItemText struct {
 
 type walletPage struct {
 	walletInfo    *wallet.MultiWalletInfo
-	subPage       int
-	current       wallet.InfoShort
 	wallet        *wallet.Wallet
 	walletAccount **wallet.Account
 	theme         *decredmaterial.Theme

diff --git a/ui/window.go b/ui/window.go
@@ -54,7 +54,7 @@ type Window struct {
 	keyEvents               chan *key.Event
 	clipboard               chan interface{}
 	toast                   chan *toast
-	sysDestroyWithSync      bool
+	// sysDestroyWithSync      bool
 }
 
 type WriteClipboard struct {