fix crash when verify seeds

JustinBeBoy · Apr 25, 2024 · 3ec91e8 · 3ec91e8
1 parent 82c67a3
commit 3ec91e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/libwallet/assets/wallet/types.go b/libwallet/assets/wallet/types.go
@@ -1,7 +1,6 @@
 package wallet
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/asdine/storm"
@@ -441,10 +440,8 @@ func (s WordSeedType) ToInt() int {
 func (s WordSeedType) AllSeeds() []string {
 	switch s {
 	case WordSeed24, WordSeed12:
-		fmt.Println("-------BIP39WordList--------")
 		return wordlist.BIP39WordList()
 	case WordSeed33:
-		fmt.Println("--------PGPWordList-------")
 		return wordlist.PGPWordList()
 	default:
 		return []string{}

diff --git a/ui/page/seedbackup/verify_seed.go b/ui/page/seedbackup/verify_seed.go
@@ -1,7 +1,6 @@
 package seedbackup
 
 import (
-	"fmt"
 	"math/rand"
 	"strings"
 
@@ -97,8 +96,8 @@ func (pg *VerifySeedPage) OnNavigatedTo() {
 	seedWords := strings.Split(pg.seed, " ")
 	for _, word := range seedWords {
 		listGroupSeed = append(listGroupSeed, &layout.List{Axis: layout.Horizontal})
-		index := seedPosition(strings.TrimSpace(word), allSeeds)
-		shuffledSeed := pg.getMultiSeed(index, allSeeds) // using allSeeds here modifies the slice
+		index := seedPosition(word, allSeeds)
+		shuffledSeed := pg.getMultiSeed(index, pg.wordSeedType.AllSeeds()) // using allSeeds here modifies the slice
 		multiSeedList = append(multiSeedList, shuffledSeed)
 	}
 
@@ -141,11 +140,10 @@ func (pg *VerifySeedPage) getMultiSeed(realSeedIndex int, allSeeds []string) shu
 
 func seedPosition(seed string, allSeeds []string) int {
 	for i := range allSeeds {
-		if strings.TrimSpace(allSeeds[i]) == strings.TrimSpace(seed) {
+		if allSeeds[i] == seed {
 			return i
 		}
 	}
-	fmt.Println("NOT FOUND====>", seed)
 	return -1
 }