Skip to content

Commit

Permalink
implemented multiwallet feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Sirmorrison committed Dec 8, 2019
1 parent 1704a65 commit 0f77b1d
Show file tree
Hide file tree
Showing 11 changed files with 523 additions and 661 deletions.
2 changes: 1 addition & 1 deletion cmd/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/decred/slog v1.0.0
github.com/jessevdk/go-flags v1.4.0
github.com/jrick/logrotate v1.0.0
github.com/raedahgroup/dcrlibwallet v1.1.1-0.20190928085114-bcc6e6b7769a // indirect
github.com/raedahgroup/godcr/app v0.0.0-00010101000000-000000000000
github.com/raedahgroup/godcr/cli v0.0.0-00010101000000-000000000000
github.com/raedahgroup/godcr/nuklear v0.0.0-00010101000000-000000000000
github.com/raedahgroup/godcr/terminal v0.0.0-00010101000000-000000000000 // indirect
github.com/raedahgroup/godcr/web v0.0.0-00010101000000-000000000000
)

Expand Down
102 changes: 1 addition & 101 deletions cmd/go.sum

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions fyne/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@ module github.com/raedahgroup/godcr/fyne
go 1.13

require (
<<<<<<< HEAD
fyne.io/fyne v1.1.3-0.20191104221827-e8f6795efa08
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
github.com/decred/dcrd/dcrutil v1.4.0
github.com/decred/dcrd/chaincfg/chainhash v1.0.1
=======
fyne.io/fyne v1.1.2
github.com/decred/dcrd/chaincfg/chainhash v1.0.1
github.com/decred/dcrd/dcrutil v1.2.0
>>>>>>> added copy txhash copy functionality for txdetails page, aligned txdetails popup, cleaned up code
github.com/decred/slog v1.0.0
github.com/gen2brain/beeep v0.0.0-20190719094215-ece0cb67ca77
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion fyne/pages/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (app *AppInterface) setupNavigationMenu() {
case 0:
newPageContent = overviewPageContent(app)
case 1:
newPageContent = historyPageContent()
newPageContent = historyPageContent(app)
case 2:
newPageContent = sendPageContent()
case 3:
Expand Down
Loading

0 comments on commit 0f77b1d

Please sign in to comment.