Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
40 changes: 22 additions & 18 deletions lib/providers/wallet_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1946,15 +1946,16 @@ class WalletProvider extends ChangeNotifier {
}

/// Restaura tokens usando otro mnemonic y los transfiere al wallet actual.
Future<BigInt> restoreWithMnemonic(
/// Retorna un mapa con el mintUrl como clave y un mapa de unit->balance como valor.
Future<Map<String, Map<String, BigInt>>> restoreWithMnemonic(
String mnemonic,
List<String> mintUrls,
) async {
if (_db == null || _mnemonic == null) {
throw Exception('WalletProvider no inicializado');
}

BigInt totalRecovered = BigInt.zero;
final results = <String, Map<String, BigInt>>{};

// Normalizar mnemonic
final normalizedMnemonic =
Expand Down Expand Up @@ -1988,21 +1989,24 @@ class WalletProvider extends ChangeNotifier {
await tempWallet.restore();
final tempBalance = await tempWallet.balance();

if (tempBalance > BigInt.zero) {
// Enviar todo el balance
final prepared =
await tempWallet.prepareSend(amount: tempBalance);
final result = await tempWallet.send(
send: prepared,
memo: 'Recuperación El Caju',
includeMemo: true,
);

// Reclamar en nuestro wallet
final ourWallet = await getWallet(mintUrl, unit);
final received = await ourWallet.receive(token: result.token);
totalRecovered += received;
}
// Inicializar el mapa de unidades para este mint si no existe
results[mintUrl] ??= {};

if (tempBalance > BigInt.zero) {
// Enviar todo el balance
final prepared =
await tempWallet.prepareSend(amount: tempBalance);
final result = await tempWallet.send(
send: prepared,
memo: 'Recuperación El Caju',
includeMemo: true,
);

// Reclamar en nuestro wallet
final ourWallet = await getWallet(mintUrl, unit);
final received = await ourWallet.receive(token: result.token);
results[mintUrl]![unit] = (results[mintUrl]![unit] ?? BigInt.zero) + received;
Comment thread
Delgado74 marked this conversation as resolved.
}
} catch (e) {
debugPrint('Error restaurando $mintUrl:$unit: $e');
}
Expand All @@ -2022,7 +2026,7 @@ class WalletProvider extends ChangeNotifier {
}

notifyListeners();
return totalRecovered;
return results;
}

// ============================================================
Expand Down
27 changes: 20 additions & 7 deletions lib/screens/8_settings/recover_tokens_modal.dart
Original file line number Diff line number Diff line change
Expand Up @@ -668,20 +668,33 @@ class _RecoverTokensModalState extends State<RecoverTokensModal> {
return;
}

final recovered = await walletProvider.restoreWithMnemonic(
final recoveredMap = await walletProvider.restoreWithMnemonic(
mnemonic,
mintUrls,
);

if (!mounted) return;
setState(() {
_isSuccess = true;
if (recovered > BigInt.zero) {
// Usamos la unidad activa como aproximación para el formato
final activeUnit = walletProvider.activeUnit;
final formatted = UnitFormatter.formatBalance(recovered, activeUnit);
final label = UnitFormatter.getUnitLabel(activeUnit);
_result = l10n.recoveredAndTransferred(formatted, label);
final recoveredDetails = <String>[];
int mintsRecovered = 0;

for (final mintEntry in recoveredMap.entries) {
final unitBalances = mintEntry.value;
bool hasRecovered = false;
for (final unitEntry in unitBalances.entries) {
if (unitEntry.value > BigInt.zero) {
final formatted = UnitFormatter.formatBalance(unitEntry.value, unitEntry.key);
final label = UnitFormatter.getUnitLabel(unitEntry.key);
recoveredDetails.add('$formatted $label');
hasRecovered = true;
}
}
if (hasRecovered) mintsRecovered++;
}

if (recoveredDetails.isNotEmpty) {
_result = l10n.recoveredTokens(recoveredDetails.join(", "), mintsRecovered);
} else {
_result = l10n.noTokensForMnemonic;
}
Expand Down
2 changes: 1 addition & 1 deletion test/widget_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import 'package:elcaju/main.dart';
void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
// Build our app and trigger a frame.
await tester.pumpWidget(const MyApp());
await tester.pumpWidget(const ElCajuApp());

// Verify that our counter starts at 0.
expect(find.text('0'), findsOneWidget);
Expand Down