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

Jump to bottom

fix: stellar recovery #1570

Merged
merged 7 commits into from
Sep 13, 2024
Merged

fix: stellar recovery #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
10f7ac7
upd
justinenerio Sep 6, 2024
62e3c69
Merge commit '9577abc38f1d5c5671f1219d6897eb60e2fb0f95' into stellar-…
justinenerio Sep 10, 2024
e315d86
Merge commit '1da19d7b02344950ae4345d1dcbdf5a9d2dec6dc' into stellar-…
justinenerio Sep 11, 2024
d1300f8
upd
justinenerio Sep 12, 2024
7c2f400
upd
justinenerio Sep 12, 2024
5f3f6d5
Merge branch 'master' into stellar-recovery-upd
justinenerio Sep 13, 2024
3cf45c4
revert
justinenerio Sep 13, 2024
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
2 changes: 1 addition & 1 deletion packages/espressocash_app/lib/features/ramp_partner/models/ramp_partner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ enum RampPartner {
coinflow(title: 'Coinflow', minimumAmount: r'$20'),
guardarian(title: 'Guardarian', minimumAmount: r'$5'),
scalex(title: 'Scalex', minimumAmount: r'$5'),
moneygram(title: 'MoneyGram', minimumAmount: r'$5');
moneygram(title: 'MoneyGram', minimumAmount: r'$10');

const RampPartner({required this.title, required this.minimumAmount});

Expand Down
35 changes: 23 additions & 12 deletions packages/espressocash_app/lib/features/stellar_recovery/service/recovery_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,19 @@ class StellarRecoveryService extends ValueNotifier<StellarRecoveryState> {
return;
}

final amount = Amount.fromDecimal(
final walletAmount = Amount.fromDecimal(
value: Decimal.parse(usdcBalance.toString()),
currency: Currency.usdc,
) as CryptoAmount;

final hash = await _initiateSwapToSolana(amount);
final hash = await _initiateSwapToSolana(walletAmount);

final receivedAmount =
_storage.getInt(_stellarRecoveryAmountKey).toCryptoAmount;

value =
StellarRecoveryState.processing(amount: receivedAmount, txId: hash);

value = StellarRecoveryState.processing(amount: value.amount, txId: hash);
_watchBridgeTx();
} on Exception {
value = const StellarRecoveryState.failed();
Expand Down Expand Up @@ -164,17 +169,23 @@ class StellarRecoveryService extends ValueNotifier<StellarRecoveryState> {
}

void _watchBridgeTx() {
_watcher =
Stream<void>.periodic(const Duration(seconds: 15)).listen((_) async {
final txId = switch (value) {
RecoveryProcessing(:final txId) => txId,
_ => null,
};
final txId = switch (value) {
RecoveryProcessing(:final txId) => txId,
_ => null,
};

if (txId == null) {
return;
}
if (txId == null || txId.isEmpty) {
_watcher?.cancel();

value = StellarRecoveryState.pending(
amount: _storage.getInt(_stellarRecoveryAmountKey).toCryptoAmount,
);

return;
}

_watcher =
Stream<void>.periodic(const Duration(seconds: 5)).listen((_) async {
final response = await _allbridgeApiClient.fetchStatus(
chain: Chain.stellar,
hash: txId,
Expand Down
Loading