Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: duplicated word in seedphrase #1337

Merged
merged 22 commits into from
Feb 19, 2020
Merged

Bugfix: duplicated word in seedphrase #1337

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
59e70da
progress
estebanmino Feb 11, 2020
73891b6
cleaner code
estebanmino Feb 11, 2020
0ab4196
fix check
estebanmino Feb 11, 2020
ef8e662
works
estebanmino Feb 11, 2020
74ffecf
almost there
estebanmino Feb 11, 2020
c240a39
fix some bugs
estebanmino Feb 11, 2020
19735b8
cleaner
estebanmino Feb 11, 2020
4c10019
select empty box
estebanmino Feb 11, 2020
b733d88
done
estebanmino Feb 11, 2020
774113e
undo custom changes
estebanmino Feb 11, 2020
468ae85
Revert "undo custom changes"
estebanmino Feb 11, 2020
cb039dd
Revert "Revert "undo custom changes""
estebanmino Feb 11, 2020
7ee04a6
fix bug
estebanmino Feb 11, 2020
c8ec89e
snaps
estebanmino Feb 11, 2020
17d2a9e
Merge branch 'develop' into bugfix/duplicated-word
estebanmino Feb 11, 2020
54acd16
Revert "undo custom changes"
estebanmino Feb 13, 2020
fb05819
Revert "Revert "undo custom changes""
estebanmino Feb 14, 2020
6dddb92
review comments
estebanmino Feb 18, 2020
112ee69
seedPhraseReady
estebanmino Feb 18, 2020
5b85272
Revert "Revert "undo custom changes""
estebanmino Feb 18, 2020
8ea6a86
Merge branch 'develop' into bugfix/duplicated-word
estebanmino Feb 19, 2020
7c55b6c
Merge branch 'develop' into bugfix/duplicated-word
estebanmino Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 42 additions & 66 deletions app/components/Views/AccountBackupStep5/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
},
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
Expand All @@ -184,9 +182,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
Expand All @@ -213,9 +209,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
Expand All @@ -242,9 +236,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
Expand All @@ -271,9 +263,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
Expand All @@ -300,9 +290,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
</View>
<View
Expand All @@ -317,7 +305,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
>
<TouchableOpacity
activeOpacity={0.2}
key="word_0"
key="word_6"
onPress={[Function]}
>
<Text
Expand All @@ -340,13 +328,11 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
key="word_1"
key="word_7"
onPress={[Function]}
>
<Text
Expand All @@ -369,13 +355,11 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
key="word_2"
key="word_8"
onPress={[Function]}
>
<Text
Expand All @@ -398,13 +382,11 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
key="word_3"
key="word_9"
onPress={[Function]}
>
<Text
Expand All @@ -427,13 +409,11 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
key="word_4"
key="word_10"
onPress={[Function]}
>
<Text
Expand All @@ -456,13 +436,11 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={0.2}
key="word_5"
key="word_11"
onPress={[Function]}
>
<Text
Expand All @@ -485,9 +463,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
null,
]
}
>

</Text>
/>
</TouchableOpacity>
</View>
</View>
Expand Down Expand Up @@ -519,7 +495,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -531,7 +507,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -557,7 +533,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -569,7 +545,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -595,7 +571,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -607,7 +583,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -633,7 +609,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -645,7 +621,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -671,7 +647,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -683,7 +659,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -709,7 +685,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -721,7 +697,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -747,7 +723,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -759,7 +735,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -785,7 +761,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -797,7 +773,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -823,7 +799,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -835,7 +811,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -861,7 +837,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -873,7 +849,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -899,7 +875,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -911,7 +887,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand All @@ -937,7 +913,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"paddingVertical": 5,
"width": 95,
},
null,
false,
]
}
>
Expand All @@ -949,7 +925,7 @@ exports[`AccountBackupStep5 should render correctly 1`] = `
"lineHeight": 14,
"textAlign": "center",
},
null,
false,
]
}
>
Expand Down
Loading