Skip to content

fix bug of adding stellar secret #884

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
AlaaElattar merged 2 commits into from
Feb 9, 2025
Merged

fix bug of adding stellar secret #884

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c838e9
fix bug of adding stellar secret
AlaaElattar Feb 3, 2025
50002c9
move the validation up before the valid address condition
AlaaElattar Feb 6, 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
15 changes: 11 additions & 4 deletions app/lib/widgets/wallets/add_wallet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,17 @@ class _NewWalletState extends ConsumerState<NewWallet> {
return false;
}

if (walletSecret.startsWith('S') && widget.wallets.any((wallet) => wallet.stellarSecret == walletSecret)){
if (walletSecret.startsWith('S') &&
widget.wallets.any((wallet) => wallet.stellarSecret == walletSecret)) {
secretError = 'Secret already exists';
return false;
}

if (walletSecret.startsWith('S') && !isValidStellarSecret(walletSecret)) {
secretError = 'Invalid Stellar secret';
return false;
}

if (isValidStellarSecret(walletSecret)) {
return true;
}
Expand All @@ -152,9 +158,9 @@ class _NewWalletState extends ConsumerState<NewWallet> {
secretError = 'Invalid seed';
return false;
}
if (widget.wallets.any((wallet) => wallet.tfchainSecret == walletSecret)){
if (widget.wallets.any((wallet) => wallet.tfchainSecret == walletSecret)) {
secretError = 'Secret already exists';
return false;
return false;
}
if (!walletSecret.startsWith('0x') && walletSecret.length != 64) {
secretError = 'Invalid seed length';
Expand Down Expand Up @@ -307,7 +313,8 @@ Future<Wallet> loadAddedWallet(String walletName, String walletSecret,
final chainUrl = Globals().chainUrl;
final idenfyServiceUrl = Globals().idenfyServiceUrl;
final Wallet wallet = await compute((void _) async {
final wallet = await loadWallet(walletName, walletSecret, type, chainUrl, idenfyServiceUrl);
final wallet = await loadWallet(
walletName, walletSecret, type, chainUrl, idenfyServiceUrl);
return wallet;
}, null);
return wallet;
Expand Down