Merge branch 'CW-118-Allow-disabling-of-fiat' of https://github.com/cake-tech/cake_wallet into CW-118-Allow-disabling-of-fiat

This commit is contained in:
Serhii
2022-12-08 09:56:08 +02:00
28 changed files with 55 additions and 98 deletions
@@ -58,7 +58,7 @@ class TransactionsPage extends StatelessWidget {
.format(transaction.date),
formattedAmount: item.formattedCryptoAmount,
formattedFiatAmount:
dashboardViewModel.balanceViewModel.disableFiat
dashboardViewModel.balanceViewModel.isFiatDisabled
? '' : item.formattedFiatAmount,
isPending: transaction.isPending));
}
@@ -74,12 +74,9 @@ class ExchangeTradePage extends BasePage {
}
class ExchangeTradeForm extends StatefulWidget {
ExchangeTradeForm(this.exchangeTradeViewModel)
: disableFiat =
exchangeTradeViewModel.sendViewModel.balanceViewModel.disableFiat;
ExchangeTradeForm(this.exchangeTradeViewModel);
final ExchangeTradeViewModel exchangeTradeViewModel;
final bool disableFiat;
@override
ExchangeTradeState createState() => ExchangeTradeState();
+3 -3
View File
@@ -331,8 +331,8 @@ class SendCardState extends State<SendCard>
],
),
)),
if (!sendViewModel.balanceViewModel.disableFiat)
Padding(
if (!sendViewModel.isFiatDisabled)
Padding(
padding: const EdgeInsets.only(top: 20),
child: BaseTextFormField(
focusNode: fiatAmountFocus,
@@ -438,7 +438,7 @@ class SendCardState extends State<SendCard>
Padding(
padding:
EdgeInsets.only(top: 5),
child: sendViewModel.balanceViewModel.disableFiat
child: sendViewModel.isFiatDisabled
? const SizedBox(height: 14)
: Text(output
.estimatedFeeFiatAmount
+2 -5
View File
@@ -1,12 +1,9 @@
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart';
import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
import 'package:cake_wallet/view_model/settings/privacy_settings_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
import 'package:cake_wallet/entities/fiat_api_mode.dart';
class PrivacyPage extends BasePage {
PrivacyPage(this._privacySettingsViewModel);
@@ -25,8 +22,8 @@ class PrivacyPage extends BasePage {
mainAxisSize: MainAxisSize.min,
children: [
SettingsSwitcherCell(
title: S.current.fiat_api,
value: _privacySettingsViewModel.fiatApiMode,
title: S.current.disable_fiat,
value: _privacySettingsViewModel.isFiatDisabled,
onValueChange: (BuildContext context, bool value) {
_privacySettingsViewModel.setFiatMode(value);
}),