8000 Instant validation for recovery phrase input by miladsoft · Pull Request #387 · block-core/angor · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Instant validation for recovery phrase input #387

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

Merged
merged 4 commits into from
May 19, 2025
Merged

Instant validation for recovery phrase input #387

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8063580
Add validation for BIP-39 words in wallet creation process
miladsoft May 16, 2025
6d3a0fb
Refactor wallet creation validation logic to ensure all words are val…
miladsoft May 16, 2025
8a91313
Reset invalid word index upon suggestion acceptance in wallet creation
miladsoft May 16, 2025
661cf30
some small fixes
dangershony May 19, 2025
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
54 changes: 51 additions & 3 deletions src/Angor/Client/Pages/Wallet.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@
@ => HandleWordInput(wordIndex, e)"
@ => ShowSuggestionsIfNeeded(wordIndex)"
placeholder="Enter word #@wordIndex" />
@if (invalidWordIndices.TryGetValue(wordIndex, out var isInvalid) && isInvalid)
8000 {
<div class="text-danger small mt-1">Not a valid BIP-39 word</div>
}
@if (showSuggestions.TryGetValue(wordIndex, out bool showForWord) &&
showForWord &&
!string.IsNullOrWhiteSpace(userVerificationInputs[wordIndex]))
Expand Down Expand Up @@ -256,7 +260,23 @@

<p class="text-muted mb-3">@stepDescription</p>
<textarea class="form-control" rows="3" placeholder="Enter your wallet words"
@bind="newWalletWords"></textarea>
@bind="newWalletWords" @>
@if (!string.IsNullOrWhiteSpace(newWalletWords))
{
var words = newWalletWords.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
<div class="mt-2">
@for (int i = 0; i < words.Length; i++)
{
var word = words[i];
var isInvalid = !NBitcoin.Wordlist.English.GetWords().Contains(word.ToLowerInvariant());
<span class="badge @(isInvalid ? "bg-danger" : "bg-success") m-1">@word</span>
}
</div>
@if (words.Any(w => !NBitcoin.Wordlist.English.GetWords().Contains(w.ToLowerInvariant())))
{
<div class="text-danger mt-1">One or more words are not valid BIP-39 words.</div>
}
}
</div>
break;

Expand Down Expand Up @@ -1081,6 +1101,8 @@ else

private Dictionary<int, bool> showSuggestions = new();

private Dictionary<int, bool> invalidWordIndices = new();

private decimal sendAmount
{
get => Money.Satoshis(_sendInfo.SendAmount).ToUnit(MoneyUnit.BTC);
Expand Down Expand Up @@ -1169,15 +1191,19 @@ else
}
}

private bool AnyWordInvalid() => invalidWordIndices.Values.Any(v => v);

private bool CanProceedToNextStep()
{
return currentStep switch
bool baseCondition = currentStep switch
{
1 => !string.IsNullOrWhiteSpace(newWalletWords) && (isNewWallet ? backupConfirmation : true),
2 => isNewWallet ? verificationPassed : true,
2 => isNewWallet ? verificationPassed && !AnyWordInvalid() : true,
3 => true,
_ => false
};

return baseCondition;
}

private bool CanCreateWallet()
Expand Down Expand Up @@ -1316,6 +1342,7 @@ else

hasWallet = _walletStorage.HasWallet();
ClearWalletWords();
ResetWalletCreationState();

walletWordsCreateModal = false;

Expand Down Expand Up @@ -1930,6 +1957,7 @@ else
// Reset verification state
selectedWordsToVerify.Clear();
userVerificationInputs.Clear();
invalidWordIndices.Clear();
shuffledWordIndices.Clear();
verificationPassed = false;
showVerificationError = false;
Expand All @@ -1954,6 +1982,17 @@ else
userVerificationInputs[wordIndex] = input;
showSuggestions[wordIndex] = !string.IsNullOrWhiteSpace(input);
ValidateWordInput();
ValidateWordInstant(wordIndex, input);
}

private void ValidateWordInstant(int wordIndex, string input)
{
var wordlist = NBitcoin.Wordlist.English;
var words = wordlist.GetWords();
if (!string.IsNullOrWhiteSpace(input) && !words.Contains(input.ToLowerInvariant()))
invalidWordIndices[wordIndex] = true;
else
invalidWordIndices[wordIndex] = false;
}

private void ShowDropdown(int wordIndex)
Expand All @@ -1979,6 +2018,9 @@ else
{
userVerificationInputs[wordIndex] = suggestion;
showSuggestions[wordIndex] = false;

invalidWordIndices[wordIndex] = false;

ValidateWordInput();
StateHasChanged();
}
Expand All @@ -1989,4 +2031,10 @@ else
var words = wordlist.GetWords();
return words.Where(word => word.StartsWith(input, StringComparison.OrdinalIgnoreCase));
}

private void OnImportWordsInput(ChangeEventArgs e)
{
newWalletWords = e.Value?.ToString() ?? string.Empty;
StateHasChanged();
}
}
0