From 17752eb6e0a381af8a3daa6b0155e554392703b3 Mon Sep 17 00:00:00 2001
From: gregs <gregs@rainbow.me>
Date: Thu, 26 Sep 2024 02:11:05 -0300
Subject: [PATCH] Mnemonic fixes (#1714)

Co-authored-by: Daniel Sinclair <4412473+DanielSinclair@users.noreply.github.com>
---
 .../ImportWallet/ImportWalletViaSeed.tsx       |  4 ++--
 .../SeedVerifyQuiz/SeedVerifyQuiz.tsx          | 18 +++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/entries/popup/components/ImportWallet/ImportWalletViaSeed.tsx b/src/entries/popup/components/ImportWallet/ImportWalletViaSeed.tsx
index 7f20807127..4c7d608e24 100644
--- a/src/entries/popup/components/ImportWallet/ImportWalletViaSeed.tsx
+++ b/src/entries/popup/components/ImportWallet/ImportWalletViaSeed.tsx
@@ -222,7 +222,7 @@ const ImportWalletViaSeed = () => {
   const handleSeedChange = useCallback(
     (e: { target: { value: string } }, index: number) => {
       const newSecrets = [...secrets] as string[];
-      newSecrets[index] = e.target.value;
+      newSecrets[index] = e.target.value.trim().toLowerCase();
       setSecrets(newSecrets);
       setImportWalletSecrets(newSecrets);
     },
@@ -269,7 +269,7 @@ const ImportWalletViaSeed = () => {
   const handlePaste = useCallback((e: React.ClipboardEvent) => {
     const dataToBePasted = e.clipboardData.getData('text').trim();
     e.preventDefault();
-    const words = dataToBePasted.split(' ');
+    const words = dataToBePasted.trim().toLowerCase().split(' ');
     if (words.length === 12 || words.length === 24) {
       setSecrets(words);
     } else {
diff --git a/src/entries/popup/components/SeedVerifyQuiz/SeedVerifyQuiz.tsx b/src/entries/popup/components/SeedVerifyQuiz/SeedVerifyQuiz.tsx
index 626dc15ba1..dab6367e9c 100644
--- a/src/entries/popup/components/SeedVerifyQuiz/SeedVerifyQuiz.tsx
+++ b/src/entries/popup/components/SeedVerifyQuiz/SeedVerifyQuiz.tsx
@@ -160,16 +160,11 @@ export function SeedVerifyQuiz({
 
   const handleSelect = useCallback(
     ({ word, index }: { word: string; index: number }) => {
-      const alreadySelected = selectedWords.find(
-        (selectedWord) =>
-          selectedWord.index === index && selectedWord.word === word,
+      const selectedIndex = selectedWords.findIndex(
+        (selectedWord) => selectedWord.index === index,
       );
-      if (alreadySelected) {
-        const selectedWordIndex = selectedWords.findIndex(
-          (selectedWord) =>
-            selectedWord.index === index && selectedWord.word === word,
-        );
-        selectedWords.splice(selectedWordIndex, 1);
+      if (selectedIndex !== -1) {
+        selectedWords.splice(selectedIndex, 1);
         setSelectedWords([...selectedWords]);
       } else if (selectedWords.length < 3) {
         selectedWords.push({ word, index });
@@ -182,11 +177,8 @@ export function SeedVerifyQuiz({
           const seedWords = seed.split(' ');
           if (
             seedWords[3] === selectedWords[0]?.word &&
-            selectedWords[0].index === 3 &&
             seedWords[7] === selectedWords[1]?.word &&
-            selectedWords[1].index === 7 &&
-            seedWords[11] === selectedWords[2]?.word &&
-            selectedWords[2].index === 11
+            seedWords[11] === selectedWords[2]?.word
           ) {
             setValidated(true);
             playSound('CorrectSeedQuiz');