Skip to content

Commit

Permalink
chore: ♻️ Fix code following review
Browse files Browse the repository at this point in the history
  • Loading branch information
@redDwarf03
redDwarf03 committed Nov 19, 2024
1 parent dd31911 commit 4bc3945
Show file tree
Hide file tree
Showing 4 changed files with 208 additions and 54 deletions.
19 changes: 14 additions & 5 deletions lib/application/low_uco_in_dollars_warning_value.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,27 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'low_uco_in_dollars_warning_value.g.dart';

@riverpod
double lowUCOInDollarsWarningValue(LowUCOInDollarsWarningValueRef ref) {
bool checkLowUCOInDollarsWarningValue(
CheckLowUCOInDollarsWarningValueRef ref,
double balance,
double amount,
) {
const kLowUCOInDollarsWarningValue = 0.20;

final remainingBalanceInUCO =
(Decimal.parse(balance.toString()) - Decimal.parse(amount.toString()))
.toDouble();

final archethicOracleUCO =
ref.watch(aedappfm.ArchethicOracleUCOProviders.archethicOracleUCO);

if (archethicOracleUCO.usd == 0) {
// 20 UCO by default if no Oracle
return 20;
return remainingBalanceInUCO > 20;
}

return (Decimal.parse(kLowUCOInDollarsWarningValue.toString()) /
Decimal.parse(archethicOracleUCO.usd.toString()))
.toDouble();
return remainingBalanceInUCO >
(Decimal.parse(kLowUCOInDollarsWarningValue.toString()) /
Decimal.parse(archethicOracleUCO.usd.toString()))
.toDouble();
}
188 changes: 171 additions & 17 deletions lib/application/low_uco_in_dollars_warning_value.g.dart
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 16 additions & 22 deletions lib/ui/views/liquidity_add/layouts/components/liquidity_add_confirm_sheet.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:aedex/ui/views/util/components/low_uco_warning_popup.dart';
import 'package:aedex/ui/views/util/consent_uri.dart';
import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutter.dart'
as aedappfm;
import 'package:decimal/decimal.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
Expand All @@ -33,8 +32,6 @@ class LiquidityAddConfirmSheetState
if (liquidityAdd.token1 == null) {
return const SizedBox.shrink();
}
final lowUCOInDollarsWarningValue =
ref.watch(lowUCOInDollarsWarningValueProvider);

return Expanded(
child: Column(
Expand Down Expand Up @@ -83,40 +80,37 @@ class LiquidityAddConfirmSheetState
onPressed: () async {
if (liquidityAdd.token1 != null &&
liquidityAdd.token1!.isUCO &&
(Decimal.parse(
liquidityAdd.token1Balance.toString(),
) -
Decimal.parse(
liquidityAdd.token1Amount.toString(),
))
.toDouble() <
lowUCOInDollarsWarningValue) {
ref.read(
checkLowUCOInDollarsWarningValueProvider(
liquidityAdd.token1Balance,
liquidityAdd.token1Amount,
),
) ==
false) {
final result = await LowUCOWarningPopup.getDialog(context);
if (result != null && result == false) {
return;
}
}
if (liquidityAdd.token2 != null &&
liquidityAdd.token2!.isUCO &&
(Decimal.parse(
liquidityAdd.token2Balance.toString(),
) -
Decimal.parse(
liquidityAdd.token2Amount.toString(),
))
.toDouble() <
lowUCOInDollarsWarningValue) {
ref.read(
checkLowUCOInDollarsWarningValueProvider(
liquidityAdd.token2Balance,
liquidityAdd.token2Amount,
),
) ==
false) {
if (context.mounted) {
final result = await LowUCOWarningPopup.getDialog(context);
if (result != null && result == false) {
return;
}
}
}

final liquidityAddNotifier =
ref.read(liquidityAddFormNotifierProvider.notifier);
if (context.mounted) {
final liquidityAddNotifier =
ref.read(liquidityAddFormNotifierProvider.notifier);
unawaited(
liquidityAddNotifier.add(AppLocalizations.of(context)!),
);
Expand Down
17 changes: 7 additions & 10 deletions lib/ui/views/swap/layouts/components/swap_confirm_sheet.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:aedex/ui/views/util/components/low_uco_warning_popup.dart';
import 'package:aedex/ui/views/util/consent_uri.dart';
import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutter.dart'
as aedappfm;
import 'package:decimal/decimal.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
Expand All @@ -33,9 +32,6 @@ class SwapConfirmSheetState extends ConsumerState<SwapConfirmSheet> {
return const SizedBox.shrink();
}

final lowUCOInDollarsWarningValue =
ref.watch(lowUCOInDollarsWarningValueProvider);

return Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
Expand Down Expand Up @@ -83,12 +79,13 @@ class SwapConfirmSheetState extends ConsumerState<SwapConfirmSheet> {
onPressed: () async {
if (swap.tokenToSwap != null &&
swap.tokenToSwap!.isUCO &&
(Decimal.parse(
swap.tokenToSwapBalance.toString(),
) -
Decimal.parse(swap.tokenToSwapAmount.toString()))
.toDouble() <
lowUCOInDollarsWarningValue) {
ref.read(
checkLowUCOInDollarsWarningValueProvider(
swap.tokenToSwapBalance,
swap.tokenToSwapAmount,
),
) ==
false) {
final result = await LowUCOWarningPopup.getDialog(context);
if (result != null && result == false) {
return;
Expand Down

0 comments on commit 4bc3945

Please sign in to comment.