From d748f12e4441a7383c0a86c169c94053a4815314 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 4 Oct 2022 14:54:39 +0200
Subject: [PATCH 01/90] Allow marking Monero Nodes as trusted
---
cw_core/lib/node.dart | 11 +++++++++--
.../screens/nodes/node_create_or_edit_page.dart | 17 ++++++++++++++++-
.../node_create_or_edit_view_model.dart | 9 +++++++--
res/values/strings_de.arb | 1 +
res/values/strings_en.arb | 1 +
res/values/strings_es.arb | 1 +
res/values/strings_fr.arb | 1 +
res/values/strings_hi.arb | 1 +
res/values/strings_hr.arb | 1 +
res/values/strings_it.arb | 1 +
res/values/strings_ja.arb | 1 +
res/values/strings_ko.arb | 1 +
res/values/strings_nl.arb | 1 +
res/values/strings_pl.arb | 1 +
res/values/strings_pt.arb | 2 +-
res/values/strings_ru.arb | 1 +
res/values/strings_uk.arb | 1 +
res/values/strings_zh.arb | 1 +
18 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
index 7de2e84b6..dd5969b99 100644
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@@ -20,7 +20,8 @@ class Node extends HiveObject with Keyable {
@required WalletType type,
this.login,
this.password,
- this.useSSL}) {
+ this.useSSL,
+ this.trusted}) {
uriRaw = uri;
this.type = type;
}
@@ -30,7 +31,8 @@ class Node extends HiveObject with Keyable {
login = map['login'] as String,
password = map['password'] as String,
typeRaw = map['typeRaw'] as int,
- useSSL = map['useSSL'] as bool;
+ useSSL = map['useSSL'] as bool,
+ trusted = map['trusted'] as bool ?? false;
static const typeId = 1;
static const boxName = 'Nodes';
@@ -50,8 +52,13 @@ class Node extends HiveObject with Keyable {
@HiveField(4)
bool useSSL;
+ @HiveField(5)
+ bool trusted;
+
bool get isSSL => useSSL ?? false;
+ bool get isTrusted => trusted ?? false;
+
Uri get uri {
switch (type) {
case WalletType.monero:
diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart
index 6cfa67285..857bde023 100644
--- a/lib/src/screens/nodes/node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/node_create_or_edit_page.dart
@@ -174,7 +174,22 @@ class NodeCreateOrEditPage extends BasePage {
caption: S.of(context).use_ssl,
))
],
- ))
+ )),
+ Padding(
+ padding: EdgeInsets.only(top: 20),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.start,
+ mainAxisSize: MainAxisSize.max,
+ children: [
+ Observer(
+ builder: (_) => StandardCheckbox(
+ value: nodeCreateOrEditViewModel.trusted,
+ onChanged: (value) =>
+ nodeCreateOrEditViewModel.trusted = value,
+ caption: S.of(context).trusted,
+ ))
+ ],
+ )),
]
],
)),
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index ef7e03189..c14bdda5e 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -14,7 +14,8 @@ abstract class NodeCreateOrEditViewModelBase with Store {
NodeCreateOrEditViewModelBase(this._nodeSource, this._wallet)
: state = InitialExecutionState(),
connectionState = InitialExecutionState(),
- useSSL = false;
+ useSSL = false,
+ trusted = false;
@observable
ExecutionState state;
@@ -37,6 +38,9 @@ abstract class NodeCreateOrEditViewModelBase with Store {
@observable
bool useSSL;
+ @observable
+ bool trusted;
+
@computed
bool get isReady =>
(address?.isNotEmpty ?? false) && (port?.isNotEmpty ?? false);
@@ -64,6 +68,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
login = '';
password = '';
useSSL = false;
+ trusted = false;
}
@action
@@ -72,7 +77,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
state = IsExecutingState();
final node =
Node(uri: uri, type: _wallet.type, login: login, password: password,
- useSSL: useSSL);
+ useSSL: useSSL, trusted: trusted);
await _nodeSource.add(node);
state = ExecutedSuccessfullyState();
} catch (e) {
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 3457f8ab2..fa04a6a8e 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider}-Fehler",
"use_ssl" : "SSL verwenden",
+ "trusted" : "Vertrauenswürdige",
"color_theme" : "Farbthema",
"light_theme" : "Hell",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index ef8e6e495..4a46d36c8 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} error",
"use_ssl" : "Use SSL",
+ "trusted" : "Trusted",
"color_theme" : "Color theme",
"light_theme" : "Light",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 7c996134e..756ac3e11 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} error",
"use_ssl" : "Utilice SSL",
+ "trusted" : "de confianza",
"color_theme" : "Tema de color",
"light_theme" : "Ligera",
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index b347086ae..04462943e 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -434,6 +434,7 @@
"provider_error" : "Erreur de ${provider}",
"use_ssl" : "Utiliser SSL",
+ "trusted" : "de confiance",
"color_theme" : "Thème",
"light_theme" : "Clair",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 83c0808c4..f8bad76e2 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} त्रुटि",
"use_ssl" : "उपयोग SSL",
+ "trusted" : "भरोसा",
"color_theme" : "रंग विषय",
"light_theme" : "रोशनी",
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 97d4d335c..0e27e3a2c 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} greška",
"use_ssl" : "Koristi SSL",
+ "trusted" : "vjerovao",
"color_theme" : "Shema boja",
"light_theme" : "Svijetla",
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index cd779471f..ea9bbd5be 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} errore",
"use_ssl" : "Usa SSL",
+ "trusted" : "di fiducia",
"color_theme" : "Colore tema",
"light_theme" : "Bianco",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 2b3920862..5ae3a5a1a 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} エラー",
"use_ssl" : "SSLを使用する",
+ "trusted" : "信頼できる",
"color_theme" : "カラーテーマ",
"light_theme" : "光",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 85ece0603..f934784ba 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} 오류",
"use_ssl" : "SSL 사용",
+ "trusted" : "신뢰할 수 있는",
"color_theme" : "색상 테마",
"light_theme" : "빛",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 15da6fd7b..428da3d76 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} fout",
"use_ssl" : "Gebruik SSL",
+ "trusted" : "vertrouwd",
"color_theme" : "Kleur thema",
"light_theme" : "Licht",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 26d8a38d4..fda0ea721 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} pomyłka",
"use_ssl" : "Użyj SSL",
+ "trusted" : "zaufany",
"color_theme" : "Motyw kolorystyczny",
"light_theme" : "Lekki",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index bfb4a2d0a..6a55cf534 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} erro",
"use_ssl" : "Use SSL",
+ "trusted" : "confiável",
"color_theme" : "Tema de cor",
"light_theme" : "Luz",
@@ -544,7 +545,6 @@
"create_account": "Criar conta",
"privacy_policy": "Política de privacidade",
"welcome_to_cakepay": "Bem-vindo ao Cake Pay!",
- "create_account": "Registar-se",
"forgot_password": "Esqueci a senha",
"reset_password": "Redefinir senha",
"gift_cards": "Cartões de presente",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 94a5b3c0b..ebc4a615c 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -436,6 +436,7 @@
"provider_error" : "${provider} ошибка",
"use_ssl" : "Использовать SSL",
+ "trusted" : "доверенный",
"color_theme" : "Цветовая тема",
"light_theme" : "Светлая",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index b139750be..efbd5a3b8 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -435,6 +435,7 @@
"provider_error" : "${provider} помилка",
"use_ssl" : "Використати SSL",
+ "trusted" : "довіряють",
"color_theme" : "Кольорова тема",
"light_theme" : "Світла",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 487c6be52..83990cf2e 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -435,6 +435,7 @@
"provider_error" : "${provider} 错误",
"use_ssl" : "使用SSL",
+ "trusted" : "值得信赖",
"color_theme" : "主题",
"light_theme" : "艳丽",
From c37bfb2e83d2fe2ff48d911256b689dd8b53a03d Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 5 Oct 2022 15:57:17 +0200
Subject: [PATCH 02/90] Add Advanced privacy settings page and initial view
model
---
.../advanced_privacy_settings_page.dart | 173 ++++++++++++++++++
.../privacy_settings_view_model.dart | 54 ++++++
2 files changed, 227 insertions(+)
create mode 100644 lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
create mode 100644 lib/view_model/privacy_settings_view_model.dart
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
new file mode 100644
index 000000000..149b65d2e
--- /dev/null
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -0,0 +1,173 @@
+import 'package:cake_wallet/entities/generate_name.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/core/wallet_name_validator.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+
+class AdvancedPrivacySettingsPage extends BasePage {
+ AdvancedPrivacySettingsPage(this.privacySettingsViewModel);
+
+ final PrivacySettingsViewModel privacySettingsViewModel;
+
+ @override
+ String get title => S.current.privacy_settings;
+
+ @override
+ Widget body(BuildContext context) =>
+ AdvancedPrivacySettingsBody(privacySettingsViewModel);
+}
+
+class AdvancedPrivacySettingsBody extends StatefulWidget {
+ const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, {Key key})
+ : super(key: key);
+
+ final PrivacySettingsViewModel privacySettingsViewModel;
+
+ @override
+ _AdvancedPrivacySettingsBodyState createState() =>
+ _AdvancedPrivacySettingsBodyState(privacySettingsViewModel);
+}
+
+class _AdvancedPrivacySettingsBodyState
+ extends State<AdvancedPrivacySettingsBody> {
+ _AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel);
+
+ final PrivacySettingsViewModel privacySettingsViewModel;
+
+ final _formKey = GlobalKey<FormState>();
+
+ final TextEditingController _controller = TextEditingController();
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ padding: EdgeInsets.only(top: 24),
+ child: ScrollableWithBottomSection(
+ contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+ content: Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ ...privacySettingsViewModel.settings.map(
+ (item) => Observer(
+ builder: (_) => SettingsSwitcherCell(
+ title: item.title,
+ value: item.value(),
+ onValueChange: item.onValueChange,
+ ),
+ ),
+ ),
+ Observer(
+ builder: (_) {
+ if (privacySettingsViewModel.addCustomNode) {
+ return Padding(
+ padding: EdgeInsets.only(top: 24),
+ child: Form(
+ key: _formKey,
+ child: TextFormField(
+ onChanged: (value) {},
+ controller: _controller,
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 20.0,
+ fontWeight: FontWeight.w600,
+ color:
+ Theme.of(context).primaryTextTheme.title.color),
+ decoration: InputDecoration(
+ hintStyle: TextStyle(
+ fontSize: 18.0,
+ fontWeight: FontWeight.w500,
+ color: Theme.of(context)
+ .accentTextTheme
+ .display3
+ .color),
+ hintText: S.of(context).wallet_name,
+ focusedBorder: UnderlineInputBorder(
+ borderSide: BorderSide(
+ color: Theme.of(context)
+ .accentTextTheme
+ .display3
+ .decorationColor,
+ width: 1.0),
+ ),
+ enabledBorder: UnderlineInputBorder(
+ borderSide: BorderSide(
+ color: Theme.of(context)
+ .accentTextTheme
+ .display3
+ .decorationColor,
+ width: 1.0),
+ ),
+ suffixIcon: IconButton(
+ onPressed: () async {
+ final rName = await generateName();
+ FocusManager.instance.primaryFocus?.unfocus();
+
+ setState(() {
+ _controller.text = rName;
+ _controller.selection =
+ TextSelection.fromPosition(
+ TextPosition(offset: _controller.text.length),
+ );
+ });
+ },
+ icon: Container(
+ padding: const EdgeInsets.all(8),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(6.0),
+ color: Theme.of(context).hintColor,
+ ),
+ width: 34,
+ height: 34,
+ child: Image.asset(
+ 'assets/images/refresh_icon.png',
+ color: Theme.of(context)
+ .primaryTextTheme
+ .display1
+ .decorationColor,
+ ),
+ ),
+ ),
+ ),
+ validator: WalletNameValidator(),
+ ),
+ ),
+ );
+ }
+ return const SizedBox();
+ },
+ ),
+ ],
+ ),
+ bottomSectionPadding: EdgeInsets.all(24),
+ bottomSection: Column(
+ children: [
+ LoadingPrimaryButton(
+ onPressed: () {},
+ text: S.of(context).continue_text,
+ color: Theme.of(context).accentTextTheme.body2.color,
+ textColor: Colors.white,
+ ),
+ const SizedBox(height: 25),
+ Padding(
+ padding: EdgeInsets.symmetric(
+ horizontal: MediaQuery.of(context).size.width * 0.15),
+ child: Text(
+ S.of(context).settings_can_be_changed_later,
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ color: Theme.of(context).accentTextTheme.display3.color,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/view_model/privacy_settings_view_model.dart b/lib/view_model/privacy_settings_view_model.dart
new file mode 100644
index 000000000..ce5a3f7a6
--- /dev/null
+++ b/lib/view_model/privacy_settings_view_model.dart
@@ -0,0 +1,54 @@
+import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+
+part 'privacy_settings_view_model.g.dart';
+
+class PrivacySettingsViewModel = PrivacySettingsViewModelBase
+ with _$PrivacySettingsViewModel;
+
+abstract class PrivacySettingsViewModelBase with Store {
+ PrivacySettingsViewModelBase(this.type) {
+ _disableFiat = false;
+ _disableExchange = false;
+ _addCustomNode = false;
+
+ settings = [
+ SwitcherListItem(
+ title: "Disable Fiat API",
+ // title: S.current.disable_fiat,
+ value: () => _disableFiat,
+ onValueChange: (_, bool value) => _disableFiat = value,
+ ),
+ SwitcherListItem(
+ title: "Disable Exchange",
+ // title: S.current.disable_exchange,
+ value: () => _disableExchange,
+ onValueChange: (_, bool value) => _disableExchange = value,
+ ),
+ SwitcherListItem(
+ title: "Add New Custom Node",
+ // title: S.current.add_custom_node,
+ value: () => _addCustomNode,
+ onValueChange: (_, bool value) => _addCustomNode = value,
+ ),
+ ];
+ }
+
+ List<SwitcherListItem> settings;
+
+ @observable
+ bool _disableFiat;
+
+ @observable
+ bool _disableExchange;
+
+ @observable
+ bool _addCustomNode;
+
+ final WalletType type;
+
+ @computed
+ bool get addCustomNode => _addCustomNode;
+}
From 6bbedde9b7920ec090037a4ed16a89bf5f7a9b64 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 5 Oct 2022 15:58:25 +0200
Subject: [PATCH 03/90] Add privacy settings route Add text translation
---
lib/di.dart | 4 +++
lib/router.dart | 9 +++++
lib/routes.dart | 1 +
.../screens/new_wallet/new_wallet_page.dart | 35 ++++++++++++-------
res/values/strings_de.arb | 5 ++-
res/values/strings_en.arb | 5 ++-
res/values/strings_es.arb | 5 ++-
res/values/strings_fr.arb | 5 ++-
res/values/strings_hi.arb | 5 ++-
res/values/strings_hr.arb | 5 ++-
res/values/strings_it.arb | 5 ++-
res/values/strings_ja.arb | 5 ++-
res/values/strings_ko.arb | 5 ++-
res/values/strings_nl.arb | 5 ++-
res/values/strings_pl.arb | 5 ++-
res/values/strings_pt.arb | 5 ++-
res/values/strings_ru.arb | 5 ++-
res/values/strings_uk.arb | 5 ++-
res/values/strings_zh.arb | 5 ++-
19 files changed, 97 insertions(+), 27 deletions(-)
diff --git a/lib/di.dart b/lib/di.dart
index 5cc698d27..8dfbfd788 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -25,6 +25,7 @@ import 'package:cake_wallet/src/screens/dashboard/widgets/balance_page.dart';
import 'package:cake_wallet/view_model/ionia/ionia_account_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_gift_cards_list_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_purchase_merch_view_model.dart';
+import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
import 'package:cw_core/unspent_coins_info.dart';
import 'package:cake_wallet/core/backup_service.dart';
import 'package:cw_core/wallet_service.dart';
@@ -786,5 +787,8 @@ Future setup(
(IoniaAnyPayPaymentInfo paymentInfo, AnyPayPaymentCommittedInfo committedInfo)
=> IoniaPaymentStatusPage(getIt.get<IoniaPaymentStatusViewModel>(param1: paymentInfo, param2: committedInfo)));
+ getIt.registerFactoryParam<PrivacySettingsViewModel, WalletType, void>((type, _) =>
+ PrivacySettingsViewModel(type));
+
_isSetupFinished = true;
}
diff --git a/lib/router.dart b/lib/router.dart
index 051e07cb0..b19fb198e 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -10,6 +10,7 @@ import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dar
import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_tip_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_gift_card_detail_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_more_options_page.dart';
+import 'package:cake_wallet/src/screens/new_wallet/advanced_privacy_settings_page.dart';
import 'package:cake_wallet/src/screens/order_details/order_details_page.dart';
import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
import 'package:cake_wallet/src/screens/restore/restore_from_backup_page.dart';
@@ -19,6 +20,7 @@ import 'package:cake_wallet/src/screens/support/support_page.dart';
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
+import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/routes.dart';
@@ -471,6 +473,13 @@ Route<dynamic> createRoute(RouteSettings settings) {
param1: paymentInfo,
param2: commitedInfo));
+ case Routes.privacySettings:
+ final type = settings.arguments as WalletType;
+ final privacySettingsViewModel = getIt.get<PrivacySettingsViewModel>(param1: type);
+
+ return CupertinoPageRoute<void>(
+ builder: (_) => AdvancedPrivacySettingsPage(privacySettingsViewModel));
+
default:
return MaterialPageRoute<void>(
builder: (_) => Scaffold(
diff --git a/lib/routes.dart b/lib/routes.dart
index 7431d71df..8b0a6ca03 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -76,4 +76,5 @@ class Routes {
static const ioniaPaymentStatusPage = '/ionia_payment_status_page';
static const ioniaMoreOptionsPage = '/ionia_more_options_page';
static const ioniaCustomRedeemPage = '/ionia_custom_redeem_page';
+ static const privacySettings = '/privacy_settings';
}
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 2ea1eca94..8aef74445 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -198,18 +198,29 @@ class _WalletNameFormState extends State<WalletNameForm> {
]
]),
bottomSectionPadding:
- EdgeInsets.only(left: 24, right: 24, bottom: 24),
- bottomSection: Observer(
- builder: (context) {
- return LoadingPrimaryButton(
- onPressed: _confirmForm,
- text: S.of(context).seed_language_next,
- color: Colors.green,
- textColor: Colors.white,
- isLoading: _walletNewVM.state is IsExecutingState,
- isDisabled: _walletNewVM.name.isEmpty,
- );
- },
+ EdgeInsets.all(24),
+ bottomSection: Column(
+ children: [
+ Observer(
+ builder: (context) {
+ return LoadingPrimaryButton(
+ onPressed: _confirmForm,
+ text: S.of(context).seed_language_next,
+ color: Colors.green,
+ textColor: Colors.white,
+ isLoading: _walletNewVM.state is IsExecutingState,
+ isDisabled: _walletNewVM.name.isEmpty,
+ );
+ },
+ ),
+ const SizedBox(height: 25),
+ GestureDetector(
+ onTap: () {
+ Navigator.of(context).pushNamed(Routes.privacySettings);
+ },
+ child: Text(S.of(context).advanced_privacy_settings),
+ ),
+ ],
)),
);
}
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index fa04a6a8e..fa896eb97 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Wähle aus verfügbaren Optionen:",
"custom_redeem_amount": "Benutzerdefinierter Einlösungsbetrag",
"add_custom_redemption": "Benutzerdefinierte Einlösung hinzufügen",
- "remaining": "Rest"
+ "remaining": "Rest",
+ "advanced_privacy_settings": "Erweiterte Datenschutzeinstellungen",
+ "privacy_settings": "Datenschutzeinstellungen",
+ "settings_can_be_changed_later": "Diese Einstellungen können später in den App-Einstellungen geändert werden"
}
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 4a46d36c8..a79f66cc2 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Choose from the available options:",
"custom_redeem_amount": "Custom Redeem Amount",
"add_custom_redemption": "Add Custom Redemption",
- "remaining": "remaining"
+ "remaining": "remaining",
+ "advanced_privacy_settings": "Advanced Privacy Settings",
+ "privacy_settings": "Privacy Settings",
+ "settings_can_be_changed_later": "These settings can be changed later in the app settings"
}
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 756ac3e11..b953ccd45 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Elija entre las opciones disponibles:",
"custom_redeem_amount": "Cantidad de canje personalizada",
"add_custom_redemption": "Agregar redención personalizada",
- "remaining": "restante"
+ "remaining": "restante",
+ "advanced_privacy_settings": "Configuración avanzada de privacidad",
+ "privacy_settings": "La configuración de privacidad",
+ "settings_can_be_changed_later": "Estas configuraciones se pueden cambiar más tarde en la configuración de la aplicación"
}
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 04462943e..b62ae92a4 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -642,5 +642,8 @@
"choose_from_available_options": "Choisissez parmi les options disponibles :",
"custom_redeem_amount": "Montant d'échange personnalisé",
"add_custom_redemption": "Ajouter un remboursement personnalisé",
- "remaining": "restant"
+ "remaining": "restant",
+ "advanced_privacy_settings": "Paramètres de confidentialité avancés",
+ "privacy_settings": "Paramètres de confidentialité",
+ "settings_can_be_changed_later": "Ces paramètres peuvent être modifiés ultérieurement dans les paramètres de l'application"
}
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index f8bad76e2..932118e9a 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "उपलब्ध विकल्पों में से चुनें:",
"custom_redeem_amount": "कस्टम रिडीम राशि",
"add_custom_redemption": "कस्टम रिडेम्पशन जोड़ें",
- "remaining": "शेष"
+ "remaining": "शेष",
+ "advanced_privacy_settings": "उन्नत गोपनीयता सेटिंग्स",
+ "privacy_settings": "गोपनीय सेटिंग",
+ "settings_can_be_changed_later": "इन सेटिंग्स को बाद में ऐप सेटिंग में बदला जा सकता है"
}
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 0e27e3a2c..7eebebdc9 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Odaberite neku od dostupnih opcija:",
"custom_redeem_amount": "Prilagođeni iznos otkupa",
"add_custom_redemption": "Dodaj prilagođeni otkup",
- "remaining": "preostalo"
+ "remaining": "preostalo",
+ "advanced_privacy_settings": "Napredne postavke privatnosti",
+ "privacy_settings": "Postavke privatnosti",
+ "settings_can_be_changed_later": "Te se postavke mogu promijeniti kasnije u postavkama aplikacije"
}
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index ea9bbd5be..a1333dae4 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Scegli tra le opzioni disponibili:",
"custom_redeem_amount": "Importo di riscatto personalizzato",
"add_custom_redemption": "Aggiungi riscatto personalizzato",
- "remaining": "rimanente"
+ "remaining": "rimanente",
+ "advanced_privacy_settings": "Impostazioni avanzate sulla privacy",
+ "privacy_settings": "Impostazioni della privacy",
+ "settings_can_be_changed_later": "Queste impostazioni possono essere modificate in seguito nelle impostazioni dell'app"
}
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 5ae3a5a1a..733dc4a00 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "利用可能なオプションから選択してください:",
"custom_redeem_amount": "カスタム交換金額",
"add_custom_redemption": "カスタム引き換えを追加",
- "remaining": "残り"
+ "remaining": "残り",
+ "advanced_privacy_settings": "高度なプライバシー設定",
+ "privacy_settings": "プライバシー設定",
+ "settings_can_be_changed_later": "これらの設定は、後でアプリの設定で変更できます"
}
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index f934784ba..c1069c003 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "사용 가능한 옵션에서 선택:",
"custom_redeem_amount": "사용자 지정 상환 금액",
"add_custom_redemption": "사용자 지정 상환 추가",
- "remaining": "남은"
+ "remaining": "남은",
+ "advanced_privacy_settings": "고급 개인 정보 설정",
+ "privacy_settings": "개인 정보 설정",
+ "settings_can_be_changed_later": "이 설정은 나중에 앱 설정에서 변경할 수 있습니다."
}
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 428da3d76..fc3ab96cd 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Kies uit de beschikbare opties:",
"custom_redeem_amount": "Aangepast inwisselbedrag",
"add_custom_redemption": "Voeg aangepaste inwisseling toe",
- "remaining": "resterende"
+ "remaining": "resterende",
+ "advanced_privacy_settings": "Geavanceerde privacy-instellingen",
+ "privacy_settings": "Privacy instellingen",
+ "settings_can_be_changed_later": "Deze instellingen kunnen later worden gewijzigd in de app-instellingen"
}
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index fda0ea721..eb5f9d06c 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Wybierz z dostępnych opcji:",
"custom_redeem_amount": "Niestandardowa kwota wykorzystania",
"add_custom_redemption": "Dodaj niestandardowe wykorzystanie",
- "remaining": "pozostałe"
+ "remaining": "pozostałe",
+ "advanced_privacy_settings": "Zaawansowane ustawienia prywatności",
+ "privacy_settings": "Ustawienia prywatności",
+ "settings_can_be_changed_later": "Te ustawienia można później zmienić w ustawieniach aplikacji"
}
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 6a55cf534..a33bbb060 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -643,5 +643,8 @@
"choose_from_available_options": "Escolha entre as opções disponíveis:",
"custom_redeem_amount": "Valor de resgate personalizado",
"add_custom_redemption": "Adicionar resgate personalizado",
- "remaining": "restante"
+ "remaining": "restante",
+ "advanced_privacy_settings": "Configurações de privacidade avançadas",
+ "privacy_settings": "Configurações de privacidade",
+ "settings_can_be_changed_later": "Essas configurações podem ser alteradas posteriormente nas configurações do aplicativo"
}
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index ebc4a615c..efa90deec 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -644,5 +644,8 @@
"choose_from_available_options": "Выберите из доступных вариантов:",
"custom_redeem_amount": "Пользовательская сумма погашения",
"add_custom_redemption": "Добавить пользовательское погашение",
- "remaining": "осталось"
+ "remaining": "осталось",
+ "advanced_privacy_settings": "Расширенные настройки конфиденциальности",
+ "privacy_settings": "Настройки конфиденциальности",
+ "settings_can_be_changed_later": "Эти настройки можно изменить позже в настройках приложения."
}
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index efbd5a3b8..fbc47a619 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -643,5 +643,8 @@
"choose_from_available_options": "Виберіть із доступних варіантів:",
"custom_redeem_amount": "Власна сума викупу",
"add_custom_redemption": "Додати спеціальне погашення",
- "remaining": "залишилося"
+ "remaining": "залишилося",
+ "advanced_privacy_settings": "Розширені налаштування конфіденційності",
+ "privacy_settings": "Параметри конфіденційності",
+ "settings_can_be_changed_later": "Ці параметри можна змінити пізніше в налаштуваннях програми"
}
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 83990cf2e..ae2acd73a 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -642,5 +642,8 @@
"choose_from_available_options": "从可用选项中选择：",
"custom_redeem_amount": "自定义兑换金额",
"add_custom_redemption": "添加自定义兑换",
- "remaining": "剩余"
+ "remaining": "剩余",
+ "advanced_privacy_settings": "高级隐私设置",
+ "privacy_settings": "隐私设置",
+ "settings_can_be_changed_later": "稍后可以在应用设置中更改这些设置"
}
From 299df3c087ace7f188d204db8c1623222cbd2f20 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 5 Oct 2022 19:28:11 +0200
Subject: [PATCH 04/90] Separate node form to be more reusable Add node form to
privacy settings
---
lib/di.dart | 25 +--
lib/router.dart | 4 +-
.../advanced_privacy_settings_page.dart | 91 ++---------
.../nodes/node_create_or_edit_page.dart | 94 +----------
lib/src/screens/nodes/widgets/node_form.dart | 151 ++++++++++++++++++
.../node_create_or_edit_view_model.dart | 13 +-
6 files changed, 191 insertions(+), 187 deletions(-)
create mode 100644 lib/src/screens/nodes/widgets/node_form.dart
diff --git a/lib/di.dart b/lib/di.dart
index 8dfbfd788..b7f8ce949 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -343,7 +343,7 @@ Future setup(
onAuthenticationFinished: onAuthFinished,
closable: closable ?? false));
- getIt.registerFactory(() =>
+ getIt.registerFactory(() =>
BalancePage(dashboardViewModel: getIt.get<DashboardViewModel>(), settingsStore: getIt.get<SettingsStore>()));
getIt.registerFactory<DashboardPage>(() => DashboardPage( balancePage: getIt.get<BalancePage>(), walletViewModel: getIt.get<DashboardViewModel>(), addressListViewModel: getIt.get<WalletAddressListViewModel>()));
@@ -478,8 +478,9 @@ Future setup(
getIt.registerFactory(() => NodeListPage(getIt.get<NodeListViewModel>()));
- getIt.registerFactory(() =>
- NodeCreateOrEditViewModel(_nodeSource, getIt.get<AppStore>().wallet));
+ getIt.registerFactoryParam<NodeCreateOrEditViewModel, WalletType, void>(
+ (WalletType type, _) =>
+ NodeCreateOrEditViewModel(_nodeSource, type ?? getIt.get<AppStore>().wallet.type));
getIt.registerFactory(
() => NodeCreateOrEditPage(getIt.get<NodeCreateOrEditViewModel>()));
@@ -672,7 +673,7 @@ Future setup(
getIt.registerFactoryParam<FullscreenQRPage, String, bool>(
(String qrData, bool isLight) => FullscreenQRPage(qrData: qrData, isLight: isLight,));
-
+
getIt.registerFactory(() => IoniaApi());
getIt.registerFactory(() => AnyPayApi());
@@ -692,7 +693,7 @@ Future setup(
getIt.registerFactoryParam<IoniaMerchPurchaseViewModel, double, IoniaMerchant>((double amount, merchant) {
return IoniaMerchPurchaseViewModel(
- ioniaAnyPayService: getIt.get<IoniaAnyPay>(),
+ ioniaAnyPayService: getIt.get<IoniaAnyPay>(),
amount: amount,
ioniaMerchant: merchant,
);
@@ -734,31 +735,31 @@ Future setup(
ioniaService: getIt.get<IoniaService>(),
giftCard: giftCard);
});
-
+
getIt.registerFactoryParam<IoniaCustomTipViewModel, List, void>((List args, _) {
final amount = args[0] as double;
final merchant = args[1] as IoniaMerchant;
final tip = args[2] as IoniaTip;
-
+
return IoniaCustomTipViewModel(amount: amount, tip: tip, ioniaMerchant: merchant);
});
-
+
getIt.registerFactoryParam<IoniaGiftCardDetailPage, IoniaGiftCard, void>((IoniaGiftCard giftCard, _) {
return IoniaGiftCardDetailPage(getIt.get<IoniaGiftCardDetailsViewModel>(param1: giftCard));
});
getIt.registerFactoryParam<IoniaMoreOptionsPage, List, void>((List args, _){
final giftCard = args.first as IoniaGiftCard;
-
- return IoniaMoreOptionsPage(giftCard);
+
+ return IoniaMoreOptionsPage(giftCard);
});
getIt.registerFactoryParam<IoniaCustomRedeemViewModel, IoniaGiftCard, void>((IoniaGiftCard giftCard, _) => IoniaCustomRedeemViewModel(giftCard));
getIt.registerFactoryParam<IoniaCustomRedeemPage, List, void>((List args, _){
final giftCard = args.first as IoniaGiftCard;
-
- return IoniaCustomRedeemPage(getIt.get<IoniaCustomRedeemViewModel>(param1: giftCard) );
+
+ return IoniaCustomRedeemPage(getIt.get<IoniaCustomRedeemViewModel>(param1: giftCard) );
});
diff --git a/lib/router.dart b/lib/router.dart
index b19fb198e..fd820b764 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -20,6 +20,7 @@ import 'package:cake_wallet/src/screens/support/support_page.dart';
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
+import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -476,9 +477,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.privacySettings:
final type = settings.arguments as WalletType;
final privacySettingsViewModel = getIt.get<PrivacySettingsViewModel>(param1: type);
+ final nodeCreateViewModel = getIt.get<NodeCreateOrEditViewModel>(param1: type);
return CupertinoPageRoute<void>(
- builder: (_) => AdvancedPrivacySettingsPage(privacySettingsViewModel));
+ builder: (_) => AdvancedPrivacySettingsPage(privacySettingsViewModel, nodeCreateViewModel));
default:
return MaterialPageRoute<void>(
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index 149b65d2e..e22afeb92 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -1,49 +1,50 @@
-import 'package:cake_wallet/entities/generate_name.dart';
+import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/core/wallet_name_validator.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
class AdvancedPrivacySettingsPage extends BasePage {
- AdvancedPrivacySettingsPage(this.privacySettingsViewModel);
+ AdvancedPrivacySettingsPage(this.privacySettingsViewModel, this.nodeViewModel);
final PrivacySettingsViewModel privacySettingsViewModel;
+ final NodeCreateOrEditViewModel nodeViewModel;
@override
String get title => S.current.privacy_settings;
@override
Widget body(BuildContext context) =>
- AdvancedPrivacySettingsBody(privacySettingsViewModel);
+ AdvancedPrivacySettingsBody(privacySettingsViewModel, nodeViewModel);
}
class AdvancedPrivacySettingsBody extends StatefulWidget {
- const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, {Key key})
+ const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key key})
: super(key: key);
final PrivacySettingsViewModel privacySettingsViewModel;
+ final NodeCreateOrEditViewModel nodeViewModel;
@override
_AdvancedPrivacySettingsBodyState createState() =>
- _AdvancedPrivacySettingsBodyState(privacySettingsViewModel);
+ _AdvancedPrivacySettingsBodyState(privacySettingsViewModel, nodeViewModel);
}
class _AdvancedPrivacySettingsBodyState
extends State<AdvancedPrivacySettingsBody> {
- _AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel);
+ _AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel, this.nodeViewModel);
final PrivacySettingsViewModel privacySettingsViewModel;
+ final NodeCreateOrEditViewModel nodeViewModel;
final _formKey = GlobalKey<FormState>();
- final TextEditingController _controller = TextEditingController();
-
@override
Widget build(BuildContext context) {
return Container(
@@ -67,75 +68,9 @@ class _AdvancedPrivacySettingsBodyState
if (privacySettingsViewModel.addCustomNode) {
return Padding(
padding: EdgeInsets.only(top: 24),
- child: Form(
- key: _formKey,
- child: TextFormField(
- onChanged: (value) {},
- controller: _controller,
- textAlign: TextAlign.center,
- style: TextStyle(
- fontSize: 20.0,
- fontWeight: FontWeight.w600,
- color:
- Theme.of(context).primaryTextTheme.title.color),
- decoration: InputDecoration(
- hintStyle: TextStyle(
- fontSize: 18.0,
- fontWeight: FontWeight.w500,
- color: Theme.of(context)
- .accentTextTheme
- .display3
- .color),
- hintText: S.of(context).wallet_name,
- focusedBorder: UnderlineInputBorder(
- borderSide: BorderSide(
- color: Theme.of(context)
- .accentTextTheme
- .display3
- .decorationColor,
- width: 1.0),
- ),
- enabledBorder: UnderlineInputBorder(
- borderSide: BorderSide(
- color: Theme.of(context)
- .accentTextTheme
- .display3
- .decorationColor,
- width: 1.0),
- ),
- suffixIcon: IconButton(
- onPressed: () async {
- final rName = await generateName();
- FocusManager.instance.primaryFocus?.unfocus();
-
- setState(() {
- _controller.text = rName;
- _controller.selection =
- TextSelection.fromPosition(
- TextPosition(offset: _controller.text.length),
- );
- });
- },
- icon: Container(
- padding: const EdgeInsets.all(8),
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(6.0),
- color: Theme.of(context).hintColor,
- ),
- width: 34,
- height: 34,
- child: Image.asset(
- 'assets/images/refresh_icon.png',
- color: Theme.of(context)
- .primaryTextTheme
- .display1
- .decorationColor,
- ),
- ),
- ),
- ),
- validator: WalletNameValidator(),
- ),
+ child: NodeForm(
+ formKey: _formKey,
+ nodeViewModel: nodeViewModel,
),
);
}
diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart
index 857bde023..e4864cc91 100644
--- a/lib/src/screens/nodes/node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/node_create_or_edit_page.dart
@@ -1,16 +1,13 @@
import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:mobx/mobx.dart';
import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/core/node_address_validator.dart';
-import 'package:cake_wallet/core/node_port_validator.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
@@ -108,91 +105,10 @@ class NodeCreateOrEditPage extends BasePage {
padding: EdgeInsets.only(left: 24, right: 24),
child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.only(bottom: 24.0),
- content: Form(
- key: _formKey,
- child: Column(
- children: <Widget>[
- Row(
- children: <Widget>[
- Expanded(
- child: BaseTextFormField(
- controller: _addressController,
- hintText: S.of(context).node_address,
- validator: NodeAddressValidator(),
- )
- )
- ],
- ),
- SizedBox(height: 10.0),
- Row(
- children: <Widget>[
- Expanded(
- child: BaseTextFormField(
- controller: _portController,
- hintText: S.of(context).node_port,
- keyboardType: TextInputType.numberWithOptions(
- signed: false, decimal: false),
- validator: NodePortValidator(),
- )
- )
- ],
- ),
- SizedBox(height: 10.0),
- if (nodeCreateOrEditViewModel.hasAuthCredentials) ...[
- Row(
- children: <Widget>[
- Expanded(
- child: BaseTextFormField(
- controller: _loginController,
- hintText: S.of(context).login,
- )
- )
- ],
- ),
- SizedBox(height: 10.0),
- Row(
- children: <Widget>[
- Expanded(
- child: BaseTextFormField(
- controller: _passwordController,
- hintText: S.of(context).password,
- )
- )
- ],
- ),
- Padding(
- padding: EdgeInsets.only(top: 20),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.start,
- mainAxisSize: MainAxisSize.max,
- children: [
- Observer(
- builder: (_) => StandardCheckbox(
- value: nodeCreateOrEditViewModel.useSSL,
- onChanged: (value) =>
- nodeCreateOrEditViewModel.useSSL = value,
- caption: S.of(context).use_ssl,
- ))
- ],
- )),
- Padding(
- padding: EdgeInsets.only(top: 20),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.start,
- mainAxisSize: MainAxisSize.max,
- children: [
- Observer(
- builder: (_) => StandardCheckbox(
- value: nodeCreateOrEditViewModel.trusted,
- onChanged: (value) =>
- nodeCreateOrEditViewModel.trusted = value,
- caption: S.of(context).trusted,
- ))
- ],
- )),
- ]
- ],
- )),
+ content: NodeForm(
+ formKey: _formKey,
+ nodeViewModel: nodeCreateOrEditViewModel,
+ ),
bottomSectionPadding: EdgeInsets.only(bottom: 24),
bottomSection: Observer(
builder: (_) => Row(
diff --git a/lib/src/screens/nodes/widgets/node_form.dart b/lib/src/screens/nodes/widgets/node_form.dart
new file mode 100644
index 000000000..757032a2a
--- /dev/null
+++ b/lib/src/screens/nodes/widgets/node_form.dart
@@ -0,0 +1,151 @@
+import 'package:cake_wallet/core/node_address_validator.dart';
+import 'package:cake_wallet/core/node_port_validator.dart';
+import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:mobx/mobx.dart';
+
+class NodeForm extends StatelessWidget {
+ NodeForm({
+ @required this.nodeViewModel,
+ @required this.formKey,
+ }) : _addressController = TextEditingController(),
+ _portController = TextEditingController(),
+ _loginController = TextEditingController(),
+ _passwordController = TextEditingController() {
+ reaction((_) => nodeViewModel.address, (String address) {
+ if (address != _addressController.text) {
+ _addressController.text = address;
+ }
+ });
+
+ reaction((_) => nodeViewModel.port, (String port) {
+ if (port != _portController.text) {
+ _portController.text = port;
+ }
+ });
+
+ if (nodeViewModel.hasAuthCredentials) {
+ reaction((_) => nodeViewModel.login, (String login) {
+ if (login != _loginController.text) {
+ _loginController.text = login;
+ }
+ });
+
+ reaction((_) => nodeViewModel.password, (String password) {
+ if (password != _passwordController.text) {
+ _passwordController.text = password;
+ }
+ });
+ }
+
+ _addressController
+ .addListener(() => nodeViewModel.address = _addressController.text);
+ _portController
+ .addListener(() => nodeViewModel.port = _portController.text);
+ _loginController
+ .addListener(() => nodeViewModel.login = _loginController.text);
+ _passwordController
+ .addListener(() => nodeViewModel.password = _passwordController.text);
+ }
+
+ final NodeCreateOrEditViewModel nodeViewModel;
+ final GlobalKey<FormState> formKey;
+
+ final TextEditingController _addressController;
+ final TextEditingController _portController;
+ final TextEditingController _loginController;
+ final TextEditingController _passwordController;
+
+ @override
+ Widget build(BuildContext context) {
+ return Form(
+ key: formKey,
+ child: Column(
+ children: <Widget>[
+ Row(
+ children: <Widget>[
+ Expanded(
+ child: BaseTextFormField(
+ controller: _addressController,
+ hintText: S.of(context).node_address,
+ validator: NodeAddressValidator(),
+ ),
+ )
+ ],
+ ),
+ SizedBox(height: 10.0),
+ Row(
+ children: <Widget>[
+ Expanded(
+ child: BaseTextFormField(
+ controller: _portController,
+ hintText: S.of(context).node_port,
+ keyboardType: TextInputType.numberWithOptions(
+ signed: false, decimal: false),
+ validator: NodePortValidator(),
+ ))
+ ],
+ ),
+ SizedBox(height: 10.0),
+ if (nodeViewModel.hasAuthCredentials) ...[
+ Row(
+ children: <Widget>[
+ Expanded(
+ child: BaseTextFormField(
+ controller: _loginController,
+ hintText: S.of(context).login,
+ ))
+ ],
+ ),
+ SizedBox(height: 10.0),
+ Row(
+ children: <Widget>[
+ Expanded(
+ child: BaseTextFormField(
+ controller: _passwordController,
+ hintText: S.of(context).password,
+ ))
+ ],
+ ),
+ Padding(
+ padding: EdgeInsets.only(top: 20),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.start,
+ mainAxisSize: MainAxisSize.max,
+ children: [
+ Observer(
+ builder: (_) => StandardCheckbox(
+ value: nodeViewModel.useSSL,
+ onChanged: (value) => nodeViewModel.useSSL = value,
+ caption: S.of(context).use_ssl,
+ ),
+ )
+ ],
+ ),
+ ),
+ Padding(
+ padding: EdgeInsets.only(top: 20),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.start,
+ mainAxisSize: MainAxisSize.max,
+ children: [
+ Observer(
+ builder: (_) => StandardCheckbox(
+ value: nodeViewModel.trusted,
+ onChanged: (value) => nodeViewModel.trusted = value,
+ caption: S.of(context).trusted,
+ ),
+ ),
+ ],
+ ),
+ ),
+ ]
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index c14bdda5e..be6e3e316 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,7 +1,6 @@
import 'package:cake_wallet/core/execution_state.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
-import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/node.dart';
import 'package:cw_core/wallet_type.dart';
@@ -11,7 +10,7 @@ class NodeCreateOrEditViewModel = NodeCreateOrEditViewModelBase
with _$NodeCreateOrEditViewModel;
abstract class NodeCreateOrEditViewModelBase with Store {
- NodeCreateOrEditViewModelBase(this._nodeSource, this._wallet)
+ NodeCreateOrEditViewModelBase(this._nodeSource, this._walletType)
: state = InitialExecutionState(),
connectionState = InitialExecutionState(),
useSSL = false,
@@ -45,8 +44,8 @@ abstract class NodeCreateOrEditViewModelBase with Store {
bool get isReady =>
(address?.isNotEmpty ?? false) && (port?.isNotEmpty ?? false);
- bool get hasAuthCredentials => _wallet.type == WalletType.monero ||
- _wallet.type == WalletType.haven;
+ bool get hasAuthCredentials => _walletType == WalletType.monero ||
+ _walletType == WalletType.haven;
String get uri {
var uri = address;
@@ -58,7 +57,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
return uri;
}
- final WalletBase _wallet;
+ final WalletType _walletType;
final Box<Node> _nodeSource;
@action
@@ -76,7 +75,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
try {
state = IsExecutingState();
final node =
- Node(uri: uri, type: _wallet.type, login: login, password: password,
+ Node(uri: uri, type: _walletType, login: login, password: password,
useSSL: useSSL, trusted: trusted);
await _nodeSource.add(node);
state = ExecutedSuccessfullyState();
@@ -90,7 +89,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
try {
connectionState = IsExecutingState();
final node =
- Node(uri: uri, type: _wallet.type, login: login, password: password);
+ Node(uri: uri, type: _walletType, login: login, password: password);
final isAlive = await node.requestNode();
connectionState = ExecutedSuccessfullyState(payload: isAlive);
} catch (e) {
From 3c04bd9aa5899f3e626876af28adc4c270ab6546 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 5 Oct 2022 20:07:16 +0200
Subject: [PATCH 05/90] Pass wallet type when navigating Fix UI padding
---
.../screens/new_wallet/advanced_privacy_settings_page.dart | 4 ++--
lib/src/screens/new_wallet/new_wallet_page.dart | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index e22afeb92..cb3e4e8dc 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -50,7 +50,7 @@ class _AdvancedPrivacySettingsBodyState
return Container(
padding: EdgeInsets.only(top: 24),
child: ScrollableWithBottomSection(
- contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+ contentPadding: EdgeInsets.only(bottom: 24),
content: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
@@ -67,7 +67,7 @@ class _AdvancedPrivacySettingsBodyState
builder: (_) {
if (privacySettingsViewModel.addCustomNode) {
return Padding(
- padding: EdgeInsets.only(top: 24),
+ padding: EdgeInsets.only(left: 24, right: 24, top: 24),
child: NodeForm(
formKey: _formKey,
nodeViewModel: nodeViewModel,
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 8aef74445..6bbd9e72d 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -216,7 +216,8 @@ class _WalletNameFormState extends State<WalletNameForm> {
const SizedBox(height: 25),
GestureDetector(
onTap: () {
- Navigator.of(context).pushNamed(Routes.privacySettings);
+ Navigator.of(context)
+ .pushNamed(Routes.privacySettings, arguments: _walletNewVM.type);
},
child: Text(S.of(context).advanced_privacy_settings),
),
From cb9f69074563e0e81199413f54ab9f279dc16033 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Fri, 7 Oct 2022 15:25:20 +0200
Subject: [PATCH 06/90] Add Native setTrustedDaemon and trustedDaemon functions
and integrate them with their wallets
---
cw_haven/ios/Classes/haven_api.cpp | 10 ++++++++++
cw_haven/lib/api/signatures.dart | 6 +++++-
cw_haven/lib/api/types.dart | 6 +++++-
cw_haven/lib/api/wallet.dart | 12 ++++++++++++
cw_haven/lib/haven_wallet.dart | 4 ++++
cw_monero/ios/Classes/monero_api.cpp | 10 ++++++++++
cw_monero/ios/Classes/monero_api.h | 3 +++
cw_monero/lib/api/signatures.dart | 6 +++++-
cw_monero/lib/api/types.dart | 6 +++++-
cw_monero/lib/api/wallet.dart | 14 +++++++++++++-
cw_monero/lib/monero_wallet.dart | 4 ++++
.../node_list/node_create_or_edit_view_model.dart | 7 +++++++
12 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/cw_haven/ios/Classes/haven_api.cpp b/cw_haven/ios/Classes/haven_api.cpp
index c1013bf87..aecaf0016 100644
--- a/cw_haven/ios/Classes/haven_api.cpp
+++ b/cw_haven/ios/Classes/haven_api.cpp
@@ -927,6 +927,16 @@ extern "C"
return static_cast<int32_t>(rates.size());
}
+ void set_trusted_daemon(bool arg)
+ {
+ m_wallet->setTrustedDaemon(arg);
+ }
+
+ bool trusted_daemon()
+ {
+ return m_wallet->trustedDaemon();
+ }
+
#ifdef __cplusplus
}
#endif
diff --git a/cw_haven/lib/api/signatures.dart b/cw_haven/lib/api/signatures.dart
index 9dd1c8dac..c98926c51 100644
--- a/cw_haven/lib/api/signatures.dart
+++ b/cw_haven/lib/api/signatures.dart
@@ -137,4 +137,8 @@ typedef get_rate = Pointer<Int64> Function();
typedef size_of_rate = Int32 Function();
-typedef update_rate = Void Function();
\ No newline at end of file
+typedef update_rate = Void Function();
+
+typedef set_trusted_daemon = Void Function(Int8 trusted);
+
+typedef trusted_daemon = Int8 Function();
\ No newline at end of file
diff --git a/cw_haven/lib/api/types.dart b/cw_haven/lib/api/types.dart
index 878297501..81661afc2 100644
--- a/cw_haven/lib/api/types.dart
+++ b/cw_haven/lib/api/types.dart
@@ -135,4 +135,8 @@ typedef GetRate = Pointer<Int64> Function();
typedef SizeOfRate = int Function();
-typedef UpdateRate = void Function();
\ No newline at end of file
+typedef UpdateRate = void Function();
+
+typedef SetTrustedDaemon = void Function(int);
+
+typedef TrustedDaemon = int Function();
\ No newline at end of file
diff --git a/cw_haven/lib/api/wallet.dart b/cw_haven/lib/api/wallet.dart
index 3370fd3e0..96e6e80a6 100644
--- a/cw_haven/lib/api/wallet.dart
+++ b/cw_haven/lib/api/wallet.dart
@@ -116,6 +116,14 @@ final rescanBlockchainAsyncNative = havenApi
.lookup<NativeFunction<rescan_blockchain>>('rescan_blockchain')
.asFunction<RescanBlockchainAsync>();
+final setTrustedDaemonNative = havenApi
+ .lookup<NativeFunction<set_trusted_daemon>>('set_trusted_daemon')
+ .asFunction<SetTrustedDaemon>();
+
+final trustedDaemonNative = havenApi
+ .lookup<NativeFunction<trusted_daemon>>('trusted_daemon')
+ .asFunction<TrustedDaemon>();
+
int getSyncingHeight() => getSyncingHeightNative();
bool isNeededToRefresh() => isNeededToRefreshNative() != 0;
@@ -346,3 +354,7 @@ Future<bool> isConnected() => compute(_isConnected, 0);
Future<int> getNodeHeight() => compute(_getNodeHeight, 0);
void rescanBlockchainAsync() => rescanBlockchainAsyncNative();
+
+Future setTrustedDaemon(bool trusted) async => setTrustedDaemonNative(_boolToInt(trusted));
+
+Future<bool> trustedDaemon() async => trustedDaemonNative() != 0;
diff --git a/cw_haven/lib/haven_wallet.dart b/cw_haven/lib/haven_wallet.dart
index c107d2f52..4a08a183a 100644
--- a/cw_haven/lib/haven_wallet.dart
+++ b/cw_haven/lib/haven_wallet.dart
@@ -390,4 +390,8 @@ abstract class HavenWalletBase extends WalletBase<MoneroBalance,
print(e.toString());
}
}
+
+ void setTrustedDaemon(bool arg) => haven_wallet.setTrustedDaemon(arg);
+
+ Future<bool> trustedDaemon() async => haven_wallet.trustedDaemon();
}
diff --git a/cw_monero/ios/Classes/monero_api.cpp b/cw_monero/ios/Classes/monero_api.cpp
index 6bb251dcf..117214295 100644
--- a/cw_monero/ios/Classes/monero_api.cpp
+++ b/cw_monero/ios/Classes/monero_api.cpp
@@ -783,6 +783,16 @@ extern "C"
return strdup(get_current_wallet()->getSubaddressLabel(accountIndex, addressIndex).c_str());
}
+ void set_trusted_daemon(bool arg)
+ {
+ m_wallet->setTrustedDaemon(arg);
+ }
+
+ bool trusted_daemon()
+ {
+ return m_wallet->trustedDaemon();
+ }
+
#ifdef __cplusplus
}
#endif
diff --git a/cw_monero/ios/Classes/monero_api.h b/cw_monero/ios/Classes/monero_api.h
index 3e2ebcff2..74258ba4c 100644
--- a/cw_monero/ios/Classes/monero_api.h
+++ b/cw_monero/ios/Classes/monero_api.h
@@ -30,6 +30,9 @@ void set_refresh_from_block_height(uint64_t height);
void set_recovering_from_seed(bool is_recovery);
void store(char *path);
+void set_trusted_daemon(bool arg);
+bool trusted_daemon();
+
#ifdef __cplusplus
}
#endif
\ No newline at end of file
diff --git a/cw_monero/lib/api/signatures.dart b/cw_monero/lib/api/signatures.dart
index 16f983480..3de4fd1a5 100644
--- a/cw_monero/lib/api/signatures.dart
+++ b/cw_monero/lib/api/signatures.dart
@@ -125,4 +125,8 @@ typedef rescan_blockchain = Void Function();
typedef get_subaddress_label = Pointer<Utf8> Function(
Int32 accountIndex,
- Int32 addressIndex);
\ No newline at end of file
+ Int32 addressIndex);
+
+typedef set_trusted_daemon = Void Function(Int8 trusted);
+
+typedef trusted_daemon = Int8 Function();
\ No newline at end of file
diff --git a/cw_monero/lib/api/types.dart b/cw_monero/lib/api/types.dart
index 3438b89fc..e328b776a 100644
--- a/cw_monero/lib/api/types.dart
+++ b/cw_monero/lib/api/types.dart
@@ -123,4 +123,8 @@ typedef RescanBlockchainAsync = void Function();
typedef GetSubaddressLabel = Pointer<Utf8> Function(
int accountIndex,
- int addressIndex);
\ No newline at end of file
+ int addressIndex);
+
+typedef SetTrustedDaemon = void Function(int);
+
+typedef TrustedDaemon = int Function();
\ No newline at end of file
diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart
index 9e84d7865..aeda971d8 100644
--- a/cw_monero/lib/api/wallet.dart
+++ b/cw_monero/lib/api/wallet.dart
@@ -120,6 +120,14 @@ final getSubaddressLabelNative = moneroApi
.lookup<NativeFunction<get_subaddress_label>>('get_subaddress_label')
.asFunction<GetSubaddressLabel>();
+final setTrustedDaemonNative = moneroApi
+ .lookup<NativeFunction<set_trusted_daemon>>('set_trusted_daemon')
+ .asFunction<SetTrustedDaemon>();
+
+final trustedDaemonNative = moneroApi
+ .lookup<NativeFunction<trusted_daemon>>('trusted_daemon')
+ .asFunction<TrustedDaemon>();
+
int getSyncingHeight() => getSyncingHeightNative();
bool isNeededToRefresh() => isNeededToRefreshNative() != 0;
@@ -353,4 +361,8 @@ void rescanBlockchainAsync() => rescanBlockchainAsyncNative();
String getSubaddressLabel(int accountIndex, int addressIndex) {
return convertUTF8ToString(pointer: getSubaddressLabelNative(accountIndex, addressIndex));
-}
\ No newline at end of file
+}
+
+Future setTrustedDaemon(bool trusted) async => setTrustedDaemonNative(_boolToInt(trusted));
+
+Future<bool> trustedDaemon() async => trustedDaemonNative() != 0;
\ No newline at end of file
diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
index 175bd96f5..772df420c 100644
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@@ -427,4 +427,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
print(e.toString());
}
}
+
+ void setTrustedDaemon(bool arg) => monero_wallet.setTrustedDaemon(arg);
+
+ Future<bool> trustedDaemon() async => monero_wallet.trustedDaemon();
}
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index c14bdda5e..4b7e0ddc9 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,4 +1,6 @@
import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cw_haven/haven_wallet.dart';
+import 'package:cw_monero/monero_wallet.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
import 'package:cw_core/wallet_base.dart';
@@ -78,6 +80,11 @@ abstract class NodeCreateOrEditViewModelBase with Store {
final node =
Node(uri: uri, type: _wallet.type, login: login, password: password,
useSSL: useSSL, trusted: trusted);
+ if (_wallet.type == WalletType.monero) {
+ (_wallet as MoneroWallet).setTrustedDaemon(trusted);
+ } else if (_wallet.type == WalletType.haven) {
+ (_wallet as HavenWallet).setTrustedDaemon(trusted);
+ }
await _nodeSource.add(node);
state = ExecutedSuccessfullyState();
} catch (e) {
From b0e188c0bd154ca9b95658a74d9369b0274bcc31 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Fri, 7 Oct 2022 20:06:33 +0200
Subject: [PATCH 07/90] Remove unused getter
---
cw_core/lib/node.dart | 2 --
1 file changed, 2 deletions(-)
diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
index dd5969b99..dca429482 100644
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@@ -57,8 +57,6 @@ class Node extends HiveObject with Keyable {
bool get isSSL => useSSL ?? false;
- bool get isTrusted => trusted ?? false;
-
Uri get uri {
switch (type) {
case WalletType.monero:
From 1eb9e65617e85ef2d70d7c324865c8cde8137565 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 20 Oct 2022 20:24:01 +0200
Subject: [PATCH 08/90] Set trusted daemon after node connection
---
cw_haven/lib/haven_wallet.dart | 6 ++----
cw_monero/lib/monero_wallet.dart | 6 ++----
.../node_list/node_create_or_edit_view_model.dart | 7 -------
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/cw_haven/lib/haven_wallet.dart b/cw_haven/lib/haven_wallet.dart
index 00d37ee08..14ff2f88e 100644
--- a/cw_haven/lib/haven_wallet.dart
+++ b/cw_haven/lib/haven_wallet.dart
@@ -121,6 +121,8 @@ abstract class HavenWalletBase extends WalletBase<MoneroBalance,
password: node.password,
useSSL: node.useSSL ?? false,
isLightWallet: false); // FIXME: hardcoded value
+
+ haven_wallet.setTrustedDaemon(node.trusted);
syncStatus = ConnectedSyncStatus();
} catch (e) {
syncStatus = FailedSyncStatus();
@@ -394,8 +396,4 @@ abstract class HavenWalletBase extends WalletBase<MoneroBalance,
print(e.toString());
}
}
-
- void setTrustedDaemon(bool arg) => haven_wallet.setTrustedDaemon(arg);
-
- Future<bool> trustedDaemon() async => haven_wallet.trustedDaemon();
}
diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
index ff0104015..86a0358f0 100644
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@@ -136,6 +136,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
password: node.password,
useSSL: node.isSSL,
isLightWallet: false); // FIXME: hardcoded value
+
+ monero_wallet.setTrustedDaemon(node.trusted);
syncStatus = ConnectedSyncStatus();
} catch (e) {
syncStatus = FailedSyncStatus();
@@ -432,8 +434,4 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
print(e.toString());
}
}
-
- void setTrustedDaemon(bool arg) => monero_wallet.setTrustedDaemon(arg);
-
- Future<bool> trustedDaemon() async => monero_wallet.trustedDaemon();
}
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index 7b481f356..e24692059 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,6 +1,4 @@
import 'package:cake_wallet/core/execution_state.dart';
-import 'package:cw_haven/haven_wallet.dart';
-import 'package:cw_monero/monero_wallet.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
import 'package:cw_core/wallet_base.dart';
@@ -84,11 +82,6 @@ abstract class NodeCreateOrEditViewModelBase with Store {
final node =
Node(uri: uri, type: _wallet.type, login: login, password: password,
useSSL: useSSL, trusted: trusted);
- if (_wallet.type == WalletType.monero) {
- (_wallet as MoneroWallet).setTrustedDaemon(trusted);
- } else if (_wallet.type == WalletType.haven) {
- (_wallet as HavenWallet).setTrustedDaemon(trusted);
- }
await _nodeSource.add(node);
state = ExecutedSuccessfullyState();
} catch (e) {
From 2cd748c151488a8378d1e28c25a98588ad163c6e Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Sat, 5 Nov 2022 20:05:55 +0200
Subject: [PATCH 09/90] filter contacts and wallets by type
---
lib/di.dart | 9 ++++---
lib/router.dart | 8 ++++--
.../screens/contact/contact_list_page.dart | 25 +++++++++++--------
.../exchange/widgets/exchange_card.dart | 3 ++-
lib/src/screens/send/widgets/send_card.dart | 1 +
lib/src/widgets/address_text_field.dart | 7 ++++--
.../contact_list/contact_list_view_model.dart | 17 +++++++++++++
7 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/lib/di.dart b/lib/di.dart
index 7ce2ff6d9..01d77b881 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -153,6 +153,7 @@ import 'package:cake_wallet/anypay/any_pay_payment_committed_info.dart';
import 'package:cake_wallet/ionia/ionia_any_pay_payment_info.dart';
import 'package:cake_wallet/src/screens/receive/fullscreen_qr_page.dart';
import 'package:cake_wallet/core/wallet_loading_service.dart';
+import 'package:cw_core/crypto_currency.dart';
final getIt = GetIt.instance;
@@ -461,9 +462,11 @@ Future setup(
getIt.registerFactory(
() => ContactListViewModel(_contactSource, _walletInfoSource));
- getIt.registerFactoryParam<ContactListPage, bool, void>(
- (bool isEditable, _) => ContactListPage(getIt.get<ContactListViewModel>(),
- isEditable: isEditable));
+ getIt.registerFactoryParam<ContactListPage, bool, CryptoCurrency?>((bool isEditable, CryptoCurrency? cur)
+ => ContactListPage(
+ getIt.get<ContactListViewModel>(),
+ isEditable: isEditable,
+ selectedCurrency: cur));
getIt.registerFactoryParam<ContactPage, ContactRecord?, void>(
(ContactRecord? contact, _) =>
diff --git a/lib/router.dart b/lib/router.dart
index b255ce8b9..8b43fbaf5 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -74,6 +74,7 @@ import 'package:cake_wallet/src/screens/ionia/ionia.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_payment_status_page.dart';
import 'package:cake_wallet/anypay/any_pay_payment_committed_info.dart';
import 'package:cake_wallet/ionia/ionia_any_pay_payment_info.dart';
+import 'package:cw_core/crypto_currency.dart';
late RouteSettings currentRouteSettings;
@@ -298,11 +299,14 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.addressBook:
return MaterialPageRoute<void>(
- builder: (_) => getIt.get<ContactListPage>(param1: true));
+ builder: (_) =>
+ getIt.get<ContactListPage>(param1: true, param2: null));
case Routes.pickerAddressBook:
+ final selectedCurrency = settings.arguments as CryptoCurrency;
return MaterialPageRoute<void>(
- builder: (_) => getIt.get<ContactListPage>(param1: false));
+ builder: (_) => getIt.get<ContactListPage>(param1: false,
+ param2: selectedCurrency));
case Routes.addressBookAddContact:
return CupertinoPageRoute<void>(
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 7912472d8..6d23518b8 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -16,10 +16,12 @@ import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart
import 'package:cake_wallet/src/widgets/collapsible_standart_list.dart';
class ContactListPage extends BasePage {
- ContactListPage(this.contactListViewModel, {this.isEditable = true});
+ ContactListPage(this.contactListViewModel,
+ {this.isEditable = true, required this.selectedCurrency});
final ContactListViewModel contactListViewModel;
final bool isEditable;
+ final CryptoCurrency? selectedCurrency;
@override
String get title => S.current.address_book;
@@ -60,11 +62,13 @@ class ContactListPage extends BasePage {
@override
Widget body(BuildContext context) {
+ final contacts =
+ contactListViewModel.getContacts(isEditable, selectedCurrency);
+ final walletContacts =
+ contactListViewModel.getWallets(isEditable, selectedCurrency);
return Container(
padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
- child: Observer(
- builder: (_) {
- return CollapsibleSectionList(
+ child: CollapsibleSectionList(
context: context,
sectionCount: 2,
themeColor: Theme.of(context).primaryTextTheme.headline6!.color!,
@@ -82,15 +86,15 @@ class ContactListPage extends BasePage {
child: Text(title, style: TextStyle(fontSize: 36)));
},
itemCounter: (int sectionIndex) => sectionIndex == 0
- ? contactListViewModel.walletContacts.length
- : contactListViewModel.contacts.length,
+ ? walletContacts.length
+ : contacts.length,
itemBuilder: (_, sectionIndex, index) {
if (sectionIndex == 0) {
- final walletInfo = contactListViewModel.walletContacts[index];
+ final walletInfo = walletContacts[index];
return generateRaw(context, walletInfo);
}
- final contact = contactListViewModel.contacts[index];
+ final contact = contacts[index];
final content = generateRaw(context, contact);
return !isEditable
? content
@@ -100,9 +104,8 @@ class ContactListPage extends BasePage {
child: content,
);
},
- );
- },
- ));
+ )
+ );
}
Widget generateRaw(BuildContext context, ContactBase contact) {
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 98843b1fb..40aa679a4 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -395,7 +395,8 @@ class ExchangeCardState extends State<ExchangeCard> {
buttonColor: widget.addressButtonsColor,
validator: widget.addressTextFieldValidator,
onPushPasteButton: widget.onPushPasteButton,
- onPushAddressBookButton: widget.onPushAddressBookButton
+ onPushAddressBookButton: widget.onPushAddressBookButton,
+ selectedCurrency: _selectedCurrency
),
)
diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart
index dc589923f..03e4471fe 100644
--- a/lib/src/screens/send/widgets/send_card.dart
+++ b/lib/src/screens/send/widgets/send_card.dart
@@ -155,6 +155,7 @@ class SendCardState extends State<SendCard>
await output.fetchParsedAddress(context);
},
validator: validator,
+ selectedCurrency: sendViewModel.currency,
);
}),
if (output.isParsedAddress) Padding(
diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index 35bf3ed85..7e0727312 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -4,6 +4,7 @@ import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/entities/qr_scanner.dart';
import 'package:cake_wallet/entities/contact_base.dart';
+import 'package:cw_core/crypto_currency.dart';
enum AddressTextFieldOption { paste, qrCode, addressBook }
@@ -26,7 +27,8 @@ class AddressTextField extends StatelessWidget {
this.hintStyle,
this.validator,
this.onPushPasteButton,
- this.onPushAddressBookButton});
+ this.onPushAddressBookButton,
+ this.selectedCurrency});
static const prefixIconWidth = 34.0;
static const prefixIconHeight = 34.0;
@@ -47,6 +49,7 @@ class AddressTextField extends StatelessWidget {
final FocusNode? focusNode;
final Function(BuildContext context)? onPushPasteButton;
final Function(BuildContext context)? onPushAddressBookButton;
+ final CryptoCurrency? selectedCurrency;
@override
Widget build(BuildContext context) {
@@ -207,7 +210,7 @@ class AddressTextField extends StatelessWidget {
Future<void> _presetAddressBookPicker(BuildContext context) async {
final contact = await Navigator.of(context, rootNavigator: true)
- .pushNamed(Routes.pickerAddressBook);
+ .pushNamed(Routes.pickerAddressBook,arguments: selectedCurrency);
if (contact is ContactBase && contact.address != null) {
controller?.text = contact.address;
diff --git a/lib/view_model/contact_list/contact_list_view_model.dart b/lib/view_model/contact_list/contact_list_view_model.dart
index ec145ad44..0f67245af 100644
--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@@ -7,6 +7,7 @@ import 'package:mobx/mobx.dart';
import 'package:cake_wallet/entities/contact_record.dart';
import 'package:cake_wallet/entities/contact.dart';
import 'package:cake_wallet/utils/mobx.dart';
+import 'package:cw_core/crypto_currency.dart';
part 'contact_list_view_model.g.dart';
@@ -44,4 +45,20 @@ abstract class ContactListViewModelBase with Store {
StreamSubscription<BoxEvent>? _subscription;
Future<void> delete(ContactRecord contact) async => contact.original.delete();
+
+ List<ContactRecord> getContacts(bool isEditable, CryptoCurrency? cur) {
+ if (!isEditable) {
+ return contacts.where((element) => element.type == cur).toList();
+ }
+
+ return contacts;
+ }
+
+ List<WalletContact> getWallets(bool isEditable, CryptoCurrency? cur) {
+ if (!isEditable) {
+ return walletContacts.where((element) => element.type == cur).toList();
+ }
+
+ return walletContacts;
+ }
}
From 7d92a964c7b8dc369249a9507790b4f30b538099 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Wed, 9 Nov 2022 12:14:21 +0200
Subject: [PATCH 10/90] Change synchronization status text
changed the status from "Starting sync" to "Attempting sync".
---
cw_bitcoin/lib/electrum_wallet.dart | 2 +-
cw_core/lib/sync_status.dart | 2 +-
cw_haven/lib/haven_wallet.dart | 2 +-
cw_monero/lib/monero_wallet.dart | 2 +-
lib/core/sync_status_title.dart | 4 ++--
res/values/strings_de.arb | 1 +
res/values/strings_en.arb | 1 +
res/values/strings_es.arb | 1 +
res/values/strings_fr.arb | 1 +
res/values/strings_hi.arb | 1 +
res/values/strings_hr.arb | 1 +
res/values/strings_it.arb | 1 +
res/values/strings_ja.arb | 1 +
res/values/strings_ko.arb | 1 +
res/values/strings_nl.arb | 1 +
res/values/strings_pl.arb | 1 +
res/values/strings_pt.arb | 1 +
res/values/strings_ru.arb | 1 +
res/values/strings_uk.arb | 1 +
res/values/strings_zh.arb | 1 +
20 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index 7abed8c07..fad546d90 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -129,7 +129,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
@override
Future<void> startSync() async {
try {
- syncStatus = StartingSyncStatus();
+ syncStatus = AttemptingSyncStatus();
await walletAddresses.discoverAddresses();
await updateTransactions();
_subscribeForUpdates();
diff --git a/cw_core/lib/sync_status.dart b/cw_core/lib/sync_status.dart
index fabec67c8..4983967d0 100644
--- a/cw_core/lib/sync_status.dart
+++ b/cw_core/lib/sync_status.dart
@@ -28,7 +28,7 @@ class NotConnectedSyncStatus extends SyncStatus {
double progress() => 0.0;
}
-class StartingSyncStatus extends SyncStatus {
+class AttemptingSyncStatus extends SyncStatus {
@override
double progress() => 0.0;
}
diff --git a/cw_haven/lib/haven_wallet.dart b/cw_haven/lib/haven_wallet.dart
index 4f360bdff..cf7c9dcdd 100644
--- a/cw_haven/lib/haven_wallet.dart
+++ b/cw_haven/lib/haven_wallet.dart
@@ -135,7 +135,7 @@ abstract class HavenWalletBase extends WalletBase<MoneroBalance,
} catch (_) {}
try {
- syncStatus = StartingSyncStatus();
+ syncStatus = AttemptingSyncStatus();
haven_wallet.startRefresh();
_setListeners();
_listener?.start();
diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
index 404d8bad0..69c61b83a 100644
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@@ -150,7 +150,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
} catch (_) {}
try {
- syncStatus = StartingSyncStatus();
+ syncStatus = AttemptingSyncStatus();
monero_wallet.startRefresh();
_setListeners();
_listener?.start();
diff --git a/lib/core/sync_status_title.dart b/lib/core/sync_status_title.dart
index e46ec2490..66094de2b 100644
--- a/lib/core/sync_status_title.dart
+++ b/lib/core/sync_status_title.dart
@@ -14,8 +14,8 @@ String syncStatusTitle(SyncStatus syncStatus) {
return S.current.sync_status_not_connected;
}
- if (syncStatus is StartingSyncStatus) {
- return S.current.sync_status_starting_sync;
+ if (syncStatus is AttemptingSyncStatus) {
+ return S.current.sync_status_attempting_sync;
}
if (syncStatus is FailedSyncStatus) {
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 685d817d5..15ab8f02a 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "GETRENNT",
"sync_status_connecting" : "VERBINDEN",
"sync_status_connected" : "VERBUNDEN",
+ "sync_status_attempting_sync" : "SYNC VERSUCHEN",
"transaction_priority_slow" : "Langsam",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 877d09231..7dd18dee6 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "DISCONNECTED",
"sync_status_connecting" : "CONNECTING",
"sync_status_connected" : "CONNECTED",
+ "sync_status_attempting_sync" : "ATTEMPTING SYNC",
"transaction_priority_slow" : "Slow",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 505f3ffa8..ee368c75f 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "DESCONECTADO",
"sync_status_connecting" : "CONECTANDO",
"sync_status_connected" : "CONECTADO",
+ "sync_status_attempting_sync" : "INTENTAR SINCRONIZAR",
"transaction_priority_slow" : "Lento",
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 941016c0b..c99e7c552 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -354,6 +354,7 @@
"sync_status_failed_connect" : "DÉCONNECTÉ",
"sync_status_connecting" : "CONNEXION EN COURS",
"sync_status_connected" : "CONNECTÉ",
+ "sync_status_attempting_sync" : "TENTATIVE DE SYNCHRONISATION",
"transaction_priority_slow" : "Lent",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 7faa06f7f..15dc9d1ed 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "डिस्कनेक्ट किया गया",
"sync_status_connecting" : "कनेक्ट",
"sync_status_connected" : "जुड़े हुए",
+ "sync_status_attempting_sync" : "सिंक करने का प्रयास",
"transaction_priority_slow" : "धीरे",
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 4fa77948a..76c67b965 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "ISKLJUČENO",
"sync_status_connecting" : "SPAJANJE",
"sync_status_connected" : "SPOJENO",
+ "sync_status_attempting_sync" : "POKUŠAJ SINKRONIZACIJE",
"transaction_priority_slow" : "Sporo",
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 9a42a588b..b62f799d5 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "DISCONNESSO",
"sync_status_connecting" : "CONNESSIONE",
"sync_status_connected" : "CONNESSO",
+ "sync_status_attempting_sync" : "TENTATIVO DI SINCRONIZZAZIONE",
"transaction_priority_slow" : "Bassa",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index c1d0de4e3..9f480a49f 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "切断されました",
"sync_status_connecting" : "接続中",
"sync_status_connected" : "接続済み",
+ "sync_status_attempting_sync" : "同期を試みています",
"transaction_priority_slow" : "スロー",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 127aa949e..ae8fe8c23 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "연결 해제",
"sync_status_connecting" : "연결 중",
"sync_status_connected" : "연결됨",
+ "sync_status_attempting_sync" : "동기화 시도 중",
"transaction_priority_slow" : "느린",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index fa748b552..5253f8b24 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "LOSGEKOPPELD",
"sync_status_connecting" : "AANSLUITING",
"sync_status_connected" : "VERBONDEN",
+ "sync_status_attempting_sync" : "SYNCHRONISATIE PROBEREN",
"transaction_priority_slow" : "Langzaam",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 454fe9717..ada641aac 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "NIEPOWIĄZANY",
"sync_status_connecting" : "ZŁĄCZONY",
"sync_status_connected" : "POŁĄCZONY",
+ "sync_status_attempting_sync" : "PRÓBA SYNCHRONIZACJI",
"transaction_priority_slow" : "Powolny",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 04a0a3ff2..edd75e704 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "DESCONECTADO",
"sync_status_connecting" : "CONECTANDO",
"sync_status_connected" : "CONECTADO",
+ "sync_status_attempting_sync" : "TENTANDO SINCRONIZAR",
"transaction_priority_slow" : "Lenta",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 632b0990c..64d27a197 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "ОТКЛЮЧЕНО",
"sync_status_connecting" : "ПОДКЛЮЧЕНИЕ",
"sync_status_connected" : "ПОДКЛЮЧЕНО",
+ "sync_status_attempting_sync" : "ПОПЫТКА СИНХРОНИЗАЦИИ",
"transaction_priority_slow" : "Медленный",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 5e0f0d18a..637cc779e 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -355,6 +355,7 @@
"sync_status_failed_connect" : "ВІДКЛЮЧЕНО",
"sync_status_connecting" : "ПІДКЛЮЧЕННЯ",
"sync_status_connected" : "ПІДКЛЮЧЕНО",
+ "sync_status_attempting_sync" : "СПРОБА СИНХРОНІЗАЦІЇ",
"transaction_priority_slow" : "Повільний",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index c46d07d59..07e800466 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -356,6 +356,7 @@
"sync_status_failed_connect" : "断线",
"sync_status_connecting" : "连接中",
"sync_status_connected" : "已连接",
+ "sync_status_attempting_sync" : "嘗試同步",
"transaction_priority_slow" : "慢速",
From ba783982e43216fea584cc2cea096020adcf491b Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 9 Nov 2022 17:53:50 +0200
Subject: [PATCH 11/90] Update branch to null safety Fix Conflicts with main
---
cw_core/lib/node.dart | 6 ++----
lib/di.dart | 5 +++--
.../advanced_privacy_settings_page.dart | 7 +++----
lib/src/screens/nodes/widgets/node_form.dart | 4 ++--
.../node_create_or_edit_view_model.dart | 13 ++++++-------
.../privacy_settings_view_model.dart | 18 +++++++++---------
6 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
index 28a54947c..5fce69a8e 100644
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@@ -17,7 +17,7 @@ class Node extends HiveObject with Keyable {
{this.login,
this.password,
this.useSSL,
- this.trusted,
+ this.trusted = false,
String? uri,
WalletType? type,}) {
if (uri != null) {
@@ -33,7 +33,7 @@ class Node extends HiveObject with Keyable {
login = map['login'] as String?,
password = map['password'] as String?,
useSSL = map['useSSL'] as bool?,
- useSSL = map['trusted'] as bool? ?? false;
+ trusted = map['trusted'] as bool? ?? false;
static const typeId = 1;
static const boxName = 'Nodes';
@@ -58,8 +58,6 @@ class Node extends HiveObject with Keyable {
bool get isSSL => useSSL ?? false;
- bool get isTrusted => trusted ?? false;
-
Uri get uri {
switch (type) {
case WalletType.monero:
diff --git a/lib/di.dart b/lib/di.dart
index 73421c989..7a3a8631c 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -478,8 +478,9 @@ Future setup(
getIt.registerFactory(() => NodeListPage(getIt.get<NodeListViewModel>()));
- getIt.registerFactory(() =>
- NodeCreateOrEditViewModel(_nodeSource, getIt.get<AppStore>().wallet!));
+ getIt.registerFactoryParam<NodeCreateOrEditViewModel, WalletType?, void>(
+ (WalletType? type, _) =>
+ NodeCreateOrEditViewModel(_nodeSource, type ?? getIt.get<AppStore>().wallet!.type));
getIt.registerFactory(
() => NodeCreateOrEditPage(getIt.get<NodeCreateOrEditViewModel>()));
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index cb3e4e8dc..58adc9d99 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -4,7 +4,6 @@ import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.
import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart';
@@ -25,7 +24,7 @@ class AdvancedPrivacySettingsPage extends BasePage {
}
class AdvancedPrivacySettingsBody extends StatefulWidget {
- const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key key})
+ const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key? key})
: super(key: key);
final PrivacySettingsViewModel privacySettingsViewModel;
@@ -85,7 +84,7 @@ class _AdvancedPrivacySettingsBodyState
LoadingPrimaryButton(
onPressed: () {},
text: S.of(context).continue_text,
- color: Theme.of(context).accentTextTheme.body2.color,
+ color: Theme.of(context).accentTextTheme.bodyText1!.color!,
textColor: Colors.white,
),
const SizedBox(height: 25),
@@ -96,7 +95,7 @@ class _AdvancedPrivacySettingsBodyState
S.of(context).settings_can_be_changed_later,
textAlign: TextAlign.center,
style: TextStyle(
- color: Theme.of(context).accentTextTheme.display3.color,
+ color: Theme.of(context).accentTextTheme.headline2?.color,
),
),
),
diff --git a/lib/src/screens/nodes/widgets/node_form.dart b/lib/src/screens/nodes/widgets/node_form.dart
index 757032a2a..52851e063 100644
--- a/lib/src/screens/nodes/widgets/node_form.dart
+++ b/lib/src/screens/nodes/widgets/node_form.dart
@@ -10,8 +10,8 @@ import 'package:mobx/mobx.dart';
class NodeForm extends StatelessWidget {
NodeForm({
- @required this.nodeViewModel,
- @required this.formKey,
+ required this.nodeViewModel,
+ required this.formKey,
}) : _addressController = TextEditingController(),
_portController = TextEditingController(),
_loginController = TextEditingController(),
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index 7137cdd2c..34167ae0a 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,7 +1,6 @@
import 'package:cake_wallet/core/execution_state.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
-import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/node.dart';
import 'package:cw_core/wallet_type.dart';
@@ -11,7 +10,7 @@ class NodeCreateOrEditViewModel = NodeCreateOrEditViewModelBase
with _$NodeCreateOrEditViewModel;
abstract class NodeCreateOrEditViewModelBase with Store {
- NodeCreateOrEditViewModelBase(this._nodeSource, this._wallet)
+ NodeCreateOrEditViewModelBase(this._nodeSource, this._walletType)
: state = InitialExecutionState(),
connectionState = InitialExecutionState(),
useSSL = false,
@@ -49,8 +48,8 @@ abstract class NodeCreateOrEditViewModelBase with Store {
bool get isReady =>
address.isNotEmpty && port.isNotEmpty;
- bool get hasAuthCredentials => _wallet.type == WalletType.monero ||
- _wallet.type == WalletType.haven;
+ bool get hasAuthCredentials => _walletType == WalletType.monero ||
+ _walletType == WalletType.haven;
String get uri {
var uri = address;
@@ -62,7 +61,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
return uri;
}
- final WalletBase _wallet;
+ final WalletType _walletType;
final Box<Node> _nodeSource;
@action
@@ -80,7 +79,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
try {
state = IsExecutingState();
final node =
- Node(uri: uri, type: _wallet.type, login: login, password: password,
+ Node(uri: uri, type: _walletType, login: login, password: password,
useSSL: useSSL, trusted: trusted);
await _nodeSource.add(node);
state = ExecutedSuccessfullyState();
@@ -94,7 +93,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
try {
connectionState = IsExecutingState();
final node =
- Node(uri: uri, type: _wallet.type, login: login, password: password);
+ Node(uri: uri, type: _walletType, login: login, password: password);
final isAlive = await node.requestNode();
connectionState = ExecutedSuccessfullyState(payload: isAlive);
} catch (e) {
diff --git a/lib/view_model/privacy_settings_view_model.dart b/lib/view_model/privacy_settings_view_model.dart
index ce5a3f7a6..760c577ef 100644
--- a/lib/view_model/privacy_settings_view_model.dart
+++ b/lib/view_model/privacy_settings_view_model.dart
@@ -9,13 +9,13 @@ class PrivacySettingsViewModel = PrivacySettingsViewModelBase
with _$PrivacySettingsViewModel;
abstract class PrivacySettingsViewModelBase with Store {
- PrivacySettingsViewModelBase(this.type) {
- _disableFiat = false;
- _disableExchange = false;
- _addCustomNode = false;
-
+ PrivacySettingsViewModelBase(this.type)
+ : _disableFiat = false,
+ _disableExchange = false,
+ _addCustomNode = false {
settings = [
SwitcherListItem(
+ // TODO: replace when Disable Fiat PR is merged
title: "Disable Fiat API",
// title: S.current.disable_fiat,
value: () => _disableFiat,
@@ -36,16 +36,16 @@ abstract class PrivacySettingsViewModelBase with Store {
];
}
- List<SwitcherListItem> settings;
+ late List<SwitcherListItem> settings;
@observable
- bool _disableFiat;
+ bool _disableFiat = false;
@observable
- bool _disableExchange;
+ bool _disableExchange = false;
@observable
- bool _addCustomNode;
+ bool _addCustomNode = false;
final WalletType type;
From ec10732eda3296cd4878bd94b02e8df8f2f87c2c Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 9 Nov 2022 19:40:12 +0200
Subject: [PATCH 12/90] Save node on continue
---
.../screens/new_wallet/advanced_privacy_settings_page.dart | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index 58adc9d99..da67d4511 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -82,7 +82,9 @@ class _AdvancedPrivacySettingsBodyState
bottomSection: Column(
children: [
LoadingPrimaryButton(
- onPressed: () {},
+ onPressed: () {
+ nodeViewModel.save();
+ },
text: S.of(context).continue_text,
color: Theme.of(context).accentTextTheme.bodyText1!.color!,
textColor: Colors.white,
From 668e9fcf076b9bf5603e9651d31de5828ab0f325 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Fri, 11 Nov 2022 15:55:21 +0200
Subject: [PATCH 13/90] [CW-73] Fix matching .exchange domain to openAlias
---
lib/entities/parse_address_from_domain.dart | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/entities/parse_address_from_domain.dart b/lib/entities/parse_address_from_domain.dart
index 7fcaeeaad..775f6e229 100644
--- a/lib/entities/parse_address_from_domain.dart
+++ b/lib/entities/parse_address_from_domain.dart
@@ -4,7 +4,6 @@ import 'package:cake_wallet/entities/parsed_address.dart';
import 'package:cake_wallet/entities/unstoppable_domain_address.dart';
import 'package:cake_wallet/entities/emoji_string_extension.dart';
import 'package:cw_core/wallet_type.dart';
-import 'package:flutter/foundation.dart';
import 'package:cake_wallet/entities/fio_address_provider.dart';
class AddressResolver {
@@ -51,7 +50,7 @@ class AddressResolver {
return ParsedAddress(addresses: [text]);
}
- if (unstoppableDomains.any((domain) => name.contains(domain))) {
+ if (unstoppableDomains.any((domain) => name.trim() == domain)) {
final address = await fetchUnstoppableDomainAddress(text, ticker);
return ParsedAddress.fetchUnstoppableDomainAddress(address: address, name: text);
}
From 69886372660be5e204083e9e05e2dbb789a4c597 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Sun, 13 Nov 2022 20:06:45 +0200
Subject: [PATCH 14/90] fix fetching trade state for SideShift
---
lib/exchange/sideshift/sideshift_exchange_provider.dart | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/exchange/sideshift/sideshift_exchange_provider.dart b/lib/exchange/sideshift/sideshift_exchange_provider.dart
index a732f7ef2..8cd4593c1 100644
--- a/lib/exchange/sideshift/sideshift_exchange_provider.dart
+++ b/lib/exchange/sideshift/sideshift_exchange_provider.dart
@@ -250,8 +250,10 @@ class SideShiftExchangeProvider extends ExchangeProvider {
final deposits = responseJSON['deposits'] as List?;
TradeState? state;
- if (deposits != null && deposits.isNotEmpty) {
- final status = deposits[0]['status'] as String;
+ if (deposits != null && deposits.isEmpty) {
+ state = TradeState.deserialize(raw: 'created');
+ } else {
+ final status = deposits?[0]['status'] as String;
state = TradeState.deserialize(raw: status);
}
From 549975ecc17316141ab22b20892fd5d7fe24140a Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Wed, 16 Nov 2022 09:29:14 +0200
Subject: [PATCH 15/90] Reorganize settings
---
lib/di.dart | 18 +-
lib/router.dart | 29 ++-
lib/routes.dart | 5 +
lib/src/screens/dashboard/wallet_menu.dart | 136 +++++-------
.../screens/nodes/widgets/node_list_row.dart | 7 +-
.../settings/connection_sync_page.dart | 155 +++++++++++++
.../settings/display_settings_page.dart | 80 +++++++
.../screens/settings/other_settings_page.dart | 45 ++++
lib/src/screens/settings/privacy_page.dart | 30 +++
.../settings/security_backup_page.dart | 84 +++++++
lib/src/screens/settings/settings.dart | 98 ---------
lib/src/widgets/standard_list.dart | 4 +-
.../settings/settings_view_model.dart | 207 ++++--------------
res/values/strings_de.arb | 6 +-
res/values/strings_en.arb | 9 +-
res/values/strings_es.arb | 6 +-
res/values/strings_fr.arb | 6 +-
res/values/strings_hi.arb | 6 +-
res/values/strings_hr.arb | 6 +-
res/values/strings_it.arb | 6 +-
res/values/strings_ja.arb | 6 +-
res/values/strings_ko.arb | 6 +-
res/values/strings_nl.arb | 6 +-
res/values/strings_pl.arb | 6 +-
res/values/strings_pt.arb | 6 +-
res/values/strings_ru.arb | 6 +-
res/values/strings_uk.arb | 7 +-
res/values/strings_zh.arb | 6 +-
28 files changed, 619 insertions(+), 373 deletions(-)
create mode 100644 lib/src/screens/settings/connection_sync_page.dart
create mode 100644 lib/src/screens/settings/display_settings_page.dart
create mode 100644 lib/src/screens/settings/other_settings_page.dart
create mode 100644 lib/src/screens/settings/privacy_page.dart
create mode 100644 lib/src/screens/settings/security_backup_page.dart
delete mode 100644 lib/src/screens/settings/settings.dart
diff --git a/lib/di.dart b/lib/di.dart
index 90549cf6f..265a5036b 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -5,9 +5,14 @@ import 'package:cake_wallet/ionia/ionia_anypay.dart';
import 'package:cake_wallet/ionia/ionia_gift_card.dart';
import 'package:cake_wallet/ionia/ionia_tip.dart';
import 'package:cake_wallet/src/screens/buy/onramper_page.dart';
+import 'package:cake_wallet/src/screens/setting/display_settings_page.dart';
+import 'package:cake_wallet/src/screens/setting/other_settings_page.dart';
+import 'package:cake_wallet/src/screens/setting/privacy_page.dart';
+import 'package:cake_wallet/src/screens/setting/security_backup_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_gift_card_detail_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_more_options_page.dart';
+import 'package:cake_wallet/src/screens/settings/connection_sync_page.dart';
import 'package:cake_wallet/view_model/ionia/ionia_auth_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_buy_card_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_custom_tip_view_model.dart';
@@ -59,7 +64,6 @@ import 'package:cake_wallet/src/screens/restore/wallet_restore_page.dart';
import 'package:cake_wallet/src/screens/seed/pre_seed_page.dart';
import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
import 'package:cake_wallet/src/screens/send/send_template_page.dart';
-import 'package:cake_wallet/src/screens/settings/settings.dart';
import 'package:cake_wallet/src/screens/setup_pin_code/setup_pin_code.dart';
import 'package:cake_wallet/src/screens/support/support_page.dart';
import 'package:cake_wallet/src/screens/trade_details/trade_details_page.dart';
@@ -439,8 +443,6 @@ Future setup(
return SettingsViewModel(appStore.settingsStore, yatStore, appStore.wallet!);
});
- getIt.registerFactory(() => SettingsPage(getIt.get<SettingsViewModel>()));
-
getIt
.registerFactory(() => WalletSeedViewModel(getIt.get<AppStore>().wallet!));
@@ -477,6 +479,16 @@ Future setup(
getIt.registerFactory(() => NodeListPage(getIt.get<NodeListViewModel>()));
+ getIt.registerFactory(() => ConnectionSyncPage(getIt.get<NodeListViewModel>(), getIt.get<DashboardViewModel>()));
+
+ getIt.registerFactory(() => SecurityBackupPage(getIt.get<SettingsViewModel>()));
+
+ getIt.registerFactory(() => PrivacyPage(getIt.get<SettingsViewModel>()));
+
+ getIt.registerFactory(() => DisplaySettingsPage(getIt.get<SettingsViewModel>()));
+
+ getIt.registerFactory(() => OtherSettingsPage(getIt.get<SettingsViewModel>()));
+
getIt.registerFactory(() =>
NodeCreateOrEditViewModel(_nodeSource, getIt.get<AppStore>().wallet!));
diff --git a/lib/router.dart b/lib/router.dart
index b255ce8b9..e35ba19ef 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -5,6 +5,10 @@ import 'package:cake_wallet/src/screens/backup/edit_backup_password_page.dart';
import 'package:cake_wallet/src/screens/buy/buy_webview_page.dart';
import 'package:cake_wallet/src/screens/buy/onramper_page.dart';
import 'package:cake_wallet/src/screens/buy/pre_order_page.dart';
+import 'package:cake_wallet/src/screens/setting/display_settings_page.dart';
+import 'package:cake_wallet/src/screens/setting/other_settings_page.dart';
+import 'package:cake_wallet/src/screens/setting/privacy_page.dart';
+import 'package:cake_wallet/src/screens/setting/security_backup_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_cards_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart';
@@ -16,6 +20,7 @@ import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
import 'package:cake_wallet/src/screens/restore/restore_from_backup_page.dart';
import 'package:cake_wallet/src/screens/restore/wallet_restore_page.dart';
import 'package:cake_wallet/src/screens/seed/pre_seed_page.dart';
+import 'package:cake_wallet/src/screens/settings/connection_sync_page.dart';
import 'package:cake_wallet/src/screens/support/support_page.dart';
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
@@ -56,7 +61,6 @@ import 'package:cake_wallet/src/screens/contact/contact_page.dart';
import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
import 'package:cake_wallet/src/screens/restore/restore_wallet_from_seed_details.dart';
import 'package:cake_wallet/src/screens/exchange/exchange_page.dart';
-import 'package:cake_wallet/src/screens/settings/settings.dart';
import 'package:cake_wallet/src/screens/rescan/rescan_page.dart';
import 'package:cake_wallet/src/screens/faq/faq_page.dart';
import 'package:cake_wallet/src/screens/trade_details/trade_details_page.dart';
@@ -278,6 +282,26 @@ Route<dynamic> createRoute(RouteSettings settings) {
return CupertinoPageRoute<void>(
builder: (_) => getIt.get<NodeListPage>());
+ case Routes.connectionSync:
+ return CupertinoPageRoute<void>(
+ builder: (_) => getIt.get<ConnectionSyncPage>());
+
+ case Routes.securityBackupPage:
+ return CupertinoPageRoute<void>(
+ builder: (_) => getIt.get<SecurityBackupPage>());
+
+ case Routes.privacyPage:
+ return CupertinoPageRoute<void>(
+ builder: (_) => getIt.get<PrivacyPage>());
+
+ case Routes.displaySettingsPage:
+ return CupertinoPageRoute<void>(
+ builder: (_) => getIt.get<DisplaySettingsPage>());
+
+ case Routes.otherSettingsPage:
+ return CupertinoPageRoute<void>(
+ builder: (_) => getIt.get<OtherSettingsPage>());
+
case Routes.newNode:
return CupertinoPageRoute<void>(
builder: (_) => getIt.get<NodeCreateOrEditPage>());
@@ -360,9 +384,6 @@ Route<dynamic> createRoute(RouteSettings settings) {
return CupertinoPageRoute<void>(
builder: (_) => getIt.get<ExchangeTemplatePage>());
- case Routes.settings:
- return MaterialPageRoute<void>(builder: (_) => getIt.get<SettingsPage>());
-
case Routes.rescan:
return MaterialPageRoute<void>(builder: (_) => getIt.get<RescanPage>());
diff --git a/lib/routes.dart b/lib/routes.dart
index 3a781ac3a..04642ba34 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -77,4 +77,9 @@ class Routes {
static const ioniaMoreOptionsPage = '/ionia_more_options_page';
static const ioniaCustomRedeemPage = '/ionia_custom_redeem_page';
static const onramperPage = '/onramper';
+ static const connectionSync = '/connection_sync_page';
+ static const securityBackupPage = '/security_and_backup_page';
+ static const privacyPage = '/privacy_page';
+ static const displaySettingsPage = '/display_settings_page';
+ static const otherSettingsPage = '/other_settings_page';
}
diff --git a/lib/src/screens/dashboard/wallet_menu.dart b/lib/src/screens/dashboard/wallet_menu.dart
index 68e7cc76d..bc1f20a5d 100644
--- a/lib/src/screens/dashboard/wallet_menu.dart
+++ b/lib/src/screens/dashboard/wallet_menu.dart
@@ -1,81 +1,64 @@
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/src/screens/dashboard/wallet_menu_item.dart';
-import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/auth/auth_page.dart';
-import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
-import 'package:cake_wallet/wallet_type_utils.dart';
// FIXME: terrible design
class WalletMenu {
WalletMenu(this.context, this.reconnect, this.hasRescan) : items = [] {
items.addAll([
- WalletMenuItem(
- title: S.current.reconnect,
- image: Image.asset('assets/images/reconnect_menu.png',
- height: 16, width: 16),
- handler: () => _presentReconnectAlert(context)),
- if (hasRescan)
- WalletMenuItem(
- title: S.current.rescan,
- image: Image.asset('assets/images/filter_icon.png',
- height: 16, width: 16, color: Palette.darkBlue),
- handler: () => Navigator.of(context).pushNamed(Routes.rescan)),
- WalletMenuItem(
- title: S.current.wallets,
- image: Image.asset('assets/images/wallet_menu.png',
- height: 16, width: 16),
- handler: () => Navigator.of(context).pushNamed(Routes.walletList)),
- WalletMenuItem(
- title: S.current.nodes,
- image: Image.asset('assets/images/nodes_menu.png',
- height: 16, width: 16),
- handler: () => Navigator.of(context).pushNamed(Routes.nodeList)),
- WalletMenuItem(
- title: S.current.show_keys,
- image:
- Image.asset('assets/images/key_menu.png', height: 16, width: 16),
- handler: () {
- Navigator.of(context).pushNamed(Routes.auth,
- arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
- if (isAuthenticatedSuccessfully) {
- auth.close(route: Routes.showKeys);
- }
- });
- }),
- WalletMenuItem(
- title: S.current.address_book_menu,
- image: Image.asset('assets/images/open_book_menu.png',
- height: 16, width: 16),
- handler: () => Navigator.of(context).pushNamed(Routes.addressBook)),
- WalletMenuItem(
- title: S.current.backup,
- image: Image.asset('assets/images/restore_wallet.png',
- height: 16,
- width: 16,
- color: Palette.darkBlue),
- handler: () {
- Navigator.of(context).pushNamed(
- Routes.auth,
- arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
- if (isAuthenticatedSuccessfully) {
- auth.close(route:Routes.backup);
- }
- });
- }),
- WalletMenuItem(
- title: S.current.settings_title,
- image: Image.asset('assets/images/settings_menu.png',
- height: 16, width: 16),
- handler: () => Navigator.of(context).pushNamed(Routes.settings)),
- WalletMenuItem(
- title: S.current.settings_support,
- image: Image.asset('assets/images/question_mark.png',
- height: 16, width: 16, color: Palette.darkBlue),
- handler: () => Navigator.of(context).pushNamed(Routes.support)),
+ WalletMenuItem(
+ title: S.current.connection_sync,
+ image: Image.asset('assets/images/nodes_menu.png',
+ height: 16, width: 16),
+ handler: () => Navigator.of(context).pushNamed(Routes.connectionSync),
+ ),
+ WalletMenuItem(
+ title: S.current.wallets,
+ image: Image.asset('assets/images/wallet_menu.png',
+ height: 16, width: 16),
+ handler: () => Navigator.of(context).pushNamed(Routes.walletList),
+ ),
+ WalletMenuItem(
+ title: S.current.security_and_backup,
+ image:
+ Image.asset('assets/images/key_menu.png', height: 16, width: 16),
+ handler: () {
+ Navigator.of(context).pushNamed(Routes.securityBackupPage);
+ }),
+ WalletMenuItem(
+ title: S.current.privacy,
+ image:
+ Image.asset('assets/images/eye_menu.png', height: 16, width: 16),
+ handler: () {
+ Navigator.of(context).pushNamed(Routes.privacyPage);
+ }),
+ WalletMenuItem(
+ title: S.current.address_book_menu,
+ image: Image.asset('assets/images/open_book_menu.png',
+ height: 16, width: 16),
+ handler: () => Navigator.of(context).pushNamed(Routes.addressBook),
+ ),
+ WalletMenuItem(
+ title: S.current.display_settings,
+ image: Image.asset('assets/images/eye_menu.png',
+ height: 16, width: 16),
+ handler: () => Navigator.of(context).pushNamed(Routes.displaySettingsPage),
+ ),
+ WalletMenuItem(
+ title: S.current.other_settings,
+ image: Image.asset('assets/images/settings_menu.png',
+ height: 16, width: 16),
+ handler: () => Navigator.of(context).pushNamed(Routes.otherSettingsPage),
+ ),
+ WalletMenuItem(
+ title: S.current.settings_support,
+ image: Image.asset('assets/images/question_mark.png',
+ height: 16, width: 16, color: Palette.darkBlue),
+ handler: () => Navigator.of(context).pushNamed(Routes.support),
+ ),
]);
}
@@ -86,23 +69,6 @@ class WalletMenu {
void action(int index) {
final item = items[index];
- item?.handler();
- }
-
- Future<void> _presentReconnectAlert(BuildContext context) async {
- await showPopUp<void>(
- context: context,
- builder: (BuildContext context) {
- return AlertWithTwoActions(
- alertTitle: S.of(context).reconnection,
- alertContent: S.of(context).reconnect_alert_text,
- rightButtonText: S.of(context).ok,
- leftButtonText: S.of(context).cancel,
- actionRightButton: () async {
- Navigator.of(context).pop();
- await reconnect?.call();
- },
- actionLeftButton: () => Navigator.of(context).pop());
- });
+ item.handler();
}
}
diff --git a/lib/src/screens/nodes/widgets/node_list_row.dart b/lib/src/screens/nodes/widgets/node_list_row.dart
index 3008d450c..580aba170 100644
--- a/lib/src/screens/nodes/widgets/node_list_row.dart
+++ b/lib/src/screens/nodes/widgets/node_list_row.dart
@@ -37,7 +37,10 @@ class NodeHeaderListRow extends StandardListRow {
@override
Widget buildTrailing(BuildContext context) {
- return Icon(Icons.add,
- color: Theme.of(context).accentTextTheme!.subtitle1!.color!, size: 24.0);
+ return SizedBox(
+ width: 20,
+ child: Icon(Icons.add,
+ color: Theme.of(context).accentTextTheme!.subtitle1!.color!, size: 24.0),
+ );
}
}
diff --git a/lib/src/screens/settings/connection_sync_page.dart b/lib/src/screens/settings/connection_sync_page.dart
new file mode 100644
index 000000000..0e56d6e58
--- /dev/null
+++ b/lib/src/screens/settings/connection_sync_page.dart
@@ -0,0 +1,155 @@
+import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
+import 'package:cw_core/node.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/nodes/widgets/node_list_row.dart';
+import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart';
+import 'package:flutter_slidable/flutter_slidable.dart';
+
+class ConnectionSyncPage extends BasePage {
+ ConnectionSyncPage(this.nodeListViewModel, this.dashboardViewModel);
+
+ @override
+ String get title => S.current.connection_sync;
+
+ final NodeListViewModel nodeListViewModel;
+ final DashboardViewModel dashboardViewModel;
+
+ @override
+ Widget body(BuildContext context) {
+ return Container(
+ padding: EdgeInsets.only(top: 10),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ SettingsCellWithArrow(
+ title: S.current.reconnect,
+ handler: (context) => _presentReconnectAlert(context),
+ ),
+ StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
+ SettingsCellWithArrow(
+ title: S.current.rescan,
+ handler: (context) => Navigator.of(context).pushNamed(Routes.rescan),
+ ),
+ StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
+ NodeHeaderListRow(
+ title: S.of(context).add_new_node,
+ onTap: (_) async => await Navigator.of(context).pushNamed(Routes.newNode),
+ ),
+ StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
+ SizedBox(height: 100),
+ Observer(
+ builder: (BuildContext context) {
+ return Flexible(
+ child: SectionStandardList(
+ sectionCount: 1,
+ context: context,
+ dividerPadding: EdgeInsets.symmetric(horizontal: 24),
+ itemCounter: (int sectionIndex) {
+ return nodeListViewModel.nodes.length;
+ },
+ itemBuilder: (_, sectionIndex, index) {
+ final node = nodeListViewModel.nodes[index];
+ final isSelected = node.keyIndex == nodeListViewModel.currentNode.keyIndex;
+ final nodeListRow = NodeListRow(
+ title: node.uriRaw,
+ isSelected: isSelected,
+ isAlive: node.requestNode(),
+ onTap: (_) async {
+ if (isSelected) {
+ return;
+ }
+
+ await showPopUp<void>(
+ context: context,
+ builder: (BuildContext context) {
+ return AlertWithTwoActions(
+ alertTitle: S.of(context).change_current_node_title,
+ alertContent: S.of(context).change_current_node(node.uriRaw),
+ leftButtonText: S.of(context).cancel,
+ rightButtonText: S.of(context).change,
+ actionLeftButton: () => Navigator.of(context).pop(),
+ actionRightButton: () async {
+ await nodeListViewModel.setAsCurrent(node);
+ Navigator.of(context).pop();
+ },
+ );
+ });
+ },
+ );
+
+ final dismissibleRow = Slidable(
+ key: Key('${node.keyIndex}'),
+ startActionPane: _actionPane(context, node),
+ endActionPane: _actionPane(context, node),
+ child: nodeListRow,
+ );
+
+ return isSelected ? nodeListRow : dismissibleRow;
+ },
+ ),
+ );
+ },
+ ),
+ ],
+ ),
+ );
+ }
+
+ Future<void> _presentReconnectAlert(BuildContext context) async {
+ await showPopUp<void>(
+ context: context,
+ builder: (BuildContext context) {
+ return AlertWithTwoActions(
+ alertTitle: S.of(context).reconnection,
+ alertContent: S.of(context).reconnect_alert_text,
+ rightButtonText: S.of(context).ok,
+ leftButtonText: S.of(context).cancel,
+ actionRightButton: () async {
+ Navigator.of(context).pop();
+ await dashboardViewModel.reconnect();
+ },
+ actionLeftButton: () => Navigator.of(context).pop());
+ },
+ );
+ }
+
+ ActionPane _actionPane(BuildContext context, Node node) => ActionPane(
+ motion: const ScrollMotion(),
+ extentRatio: 0.3,
+ children: [
+ SlidableAction(
+ onPressed: (context) async {
+ final confirmed = await showPopUp<bool>(
+ context: context,
+ builder: (BuildContext context) {
+ return AlertWithTwoActions(
+ alertTitle: S.of(context).remove_node,
+ alertContent: S.of(context).remove_node_message,
+ rightButtonText: S.of(context).remove,
+ leftButtonText: S.of(context).cancel,
+ actionRightButton: () => Navigator.pop(context, true),
+ actionLeftButton: () => Navigator.pop(context, false));
+ }) ??
+ false;
+
+ if (confirmed) {
+ await nodeListViewModel.delete(node);
+ }
+ },
+ backgroundColor: Colors.red,
+ foregroundColor: Colors.white,
+ icon: CupertinoIcons.delete,
+ label: S.of(context).delete,
+ ),
+ ],
+ );
+}
diff --git a/lib/src/screens/settings/display_settings_page.dart b/lib/src/screens/settings/display_settings_page.dart
new file mode 100644
index 000000000..a5a855b59
--- /dev/null
+++ b/lib/src/screens/settings/display_settings_page.dart
@@ -0,0 +1,80 @@
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/language_service.dart';
+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_picker_cell.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/themes/theme_list.dart';
+import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
+import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+
+class DisplaySettingsPage extends BasePage {
+ DisplaySettingsPage(this.settingsViewModel);
+
+ @override
+ String get title => S.current.display_settings;
+
+ final SettingsViewModel settingsViewModel;
+
+ @override
+ Widget body(BuildContext context) {
+ return Observer(builder: (_) {
+ return Container(
+ padding: EdgeInsets.only(top: 10),
+ child: Column(
+ children: [
+ SettingsSwitcherCell(
+ title: S.current.settings_save_recipient_address,
+ value: settingsViewModel.shouldSaveRecipientAddress,
+ onValueChange: (BuildContext _, bool value) {
+ settingsViewModel.setShouldSaveRecipientAddress(value);
+ }),
+ if (!isHaven)
+ SettingsPickerCell<FiatCurrency>(
+ title: S.current.settings_currency,
+ searchHintText: S.current.search_currency,
+ items: FiatCurrency.all,
+ selectedItem: settingsViewModel.fiatCurrency,
+ onItemSelected: (FiatCurrency currency) => settingsViewModel.setFiatCurrency(currency),
+ images: FiatCurrency.all.map((e) => Image.asset("assets/images/flags/${e.countryCode}.png")).toList(),
+ isGridView: true,
+ matchingCriteria: (FiatCurrency currency, String searchText) {
+ return currency.title.toLowerCase().contains(searchText) ||
+ currency.fullName.toLowerCase().contains(searchText);
+ },
+ ),
+ SettingsPickerCell<String>(
+ title: S.current.settings_change_language,
+ searchHintText: S.current.search_language,
+ items: LanguageService.list.keys.toList(),
+ displayItem: (dynamic code) {
+ return LanguageService.list[code] ?? '';
+ },
+ selectedItem: settingsViewModel.languageCode,
+ onItemSelected: settingsViewModel.onLanguageSelected,
+ images: LanguageService.list.keys
+ .map((e) => Image.asset("assets/images/flags/${LanguageService.localeCountryCode[e]}.png"))
+ .toList(),
+ matchingCriteria: (String code, String searchText) {
+ return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
+ },
+ ),
+ SettingsChoicesCell(
+ ChoicesListItem<ThemeBase>(
+ title: S.current.color_theme,
+ items: ThemeList.all,
+ selectedItem: settingsViewModel.theme,
+ onItemSelected: (ThemeBase theme) => settingsViewModel.setTheme(theme),
+ ),
+ ),
+ ],
+ ),
+ );
+ });
+ }
+}
diff --git a/lib/src/screens/settings/other_settings_page.dart b/lib/src/screens/settings/other_settings_page.dart
new file mode 100644
index 000000000..7d1ec311d
--- /dev/null
+++ b/lib/src/screens/settings/other_settings_page.dart
@@ -0,0 +1,45 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_version_cell.dart';
+import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
+import 'package:cw_core/transaction_priority.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+
+class OtherSettingsPage extends BasePage {
+ OtherSettingsPage(this._settingsViewModel);
+
+ @override
+ String get title => S.current.other_settings;
+
+ final SettingsViewModel _settingsViewModel;
+
+ @override
+ Widget body(BuildContext context) {
+ return Observer(builder: (_) {
+ return Container(
+ padding: EdgeInsets.only(top: 10),
+ child: Column(children: [
+ SettingsPickerCell<TransactionPriority>(
+ title: S.current.settings_fee_priority,
+ items: priorityForWalletType(_settingsViewModel.walletType),
+ displayItem: _settingsViewModel.getDisplayPriority,
+ selectedItem: _settingsViewModel.transactionPriority,
+ onItemSelected: _settingsViewModel.onDisplayPrioritySelected,
+ ),
+ SettingsCellWithArrow(
+ title: S.current.settings_terms_and_conditions,
+ handler: (BuildContext context) => Navigator.of(context).pushNamed(Routes.readDisclaimer),
+ ),
+ StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
+ Spacer(),
+ SettingsVersionCell(title: S.of(context).version(_settingsViewModel.currentVersion))
+ ]),
+ );
+ });
+ }
+}
diff --git a/lib/src/screens/settings/privacy_page.dart b/lib/src/screens/settings/privacy_page.dart
new file mode 100644
index 000000000..d8518ce3b
--- /dev/null
+++ b/lib/src/screens/settings/privacy_page.dart
@@ -0,0 +1,30 @@
+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_switcher_cell.dart';
+import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+
+class PrivacyPage extends BasePage {
+ PrivacyPage(this.settingsViewModel);
+
+ @override
+ String get title => S.current.privacy_settings;
+
+ final SettingsViewModel settingsViewModel;
+
+ @override
+ Widget body(BuildContext context) {
+ return Container(
+ padding: EdgeInsets.only(top: 10),
+ child: Observer(builder: (_) {
+ return SettingsSwitcherCell(
+ title: S.current.settings_save_recipient_address,
+ value: settingsViewModel.shouldSaveRecipientAddress,
+ onValueChange: (BuildContext _, bool value) {
+ settingsViewModel.setShouldSaveRecipientAddress(value);
+ });
+ }),
+ );
+ }
+}
diff --git a/lib/src/screens/settings/security_backup_page.dart b/lib/src/screens/settings/security_backup_page.dart
new file mode 100644
index 000000000..d950597f0
--- /dev/null
+++ b/lib/src/screens/settings/security_backup_page.dart
@@ -0,0 +1,84 @@
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/screens/auth/auth_page.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+
+class SecurityBackupPage extends BasePage {
+ SecurityBackupPage(this.settingsViewModel);
+
+ @override
+ String get title => S.current.security_and_backup;
+
+ final SettingsViewModel settingsViewModel;
+
+ @override
+ Widget body(BuildContext context) {
+ return Container(
+ padding: EdgeInsets.only(top: 10),
+ child: Column(mainAxisSize: MainAxisSize.min, children: [
+ SettingsCellWithArrow(
+ title: S.current.show_keys,
+ handler: (_) => Navigator.of(context).pushNamed(Routes.auth,
+ arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
+ if (isAuthenticatedSuccessfully) {
+ auth.close(route: Routes.showKeys);
+ }
+ }),
+ ),
+ StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
+ SettingsCellWithArrow(
+ title: S.current.create_backup,
+ handler: (_) => Navigator.of(context).pushNamed(Routes.auth,
+ arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
+ if (isAuthenticatedSuccessfully) {
+ auth.close(route: Routes.backup);
+ }
+ }),
+ ),
+ StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
+ SettingsCellWithArrow(
+ title: S.current.settings_change_pin,
+ handler: (_) => Navigator.of(context).pushNamed(Routes.auth,
+ arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
+ auth.close(
+ route: isAuthenticatedSuccessfully ? Routes.setupPin : null,
+ arguments: (PinCodeState<PinCodeWidget> setupPinContext, String _) {
+ setupPinContext.close();
+ },
+ );
+ })),
+ StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
+ Observer(builder: (_) {
+ return SettingsSwitcherCell(
+ title: S.current.settings_allow_biometrical_authentication,
+ value: settingsViewModel.allowBiometricalAuthentication,
+ onValueChange: (BuildContext context, bool value) {
+ if (value) {
+ Navigator.of(context).pushNamed(Routes.auth,
+ arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
+ if (isAuthenticatedSuccessfully) {
+ if (await settingsViewModel.biometricAuthenticated()) {
+ settingsViewModel.setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
+ }
+ } else {
+ settingsViewModel.setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
+ }
+
+ auth.close();
+ });
+ } else {
+ settingsViewModel.setAllowBiometricalAuthentication(value);
+ }
+ });
+ }),
+ ]),
+ );
+ }
+}
diff --git a/lib/src/screens/settings/settings.dart b/lib/src/screens/settings/settings.dart
deleted file mode 100644
index 3f6f41e7b..000000000
--- a/lib/src/screens/settings/settings.dart
+++ /dev/null
@@ -1,98 +0,0 @@
-import 'package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart';
-import 'package:cake_wallet/src/screens/settings/widgets/settings_version_cell.dart';
-import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
-import 'package:cake_wallet/view_model/settings/version_list_item.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
-import 'package:cake_wallet/view_model/settings/link_list_item.dart';
-import 'package:cake_wallet/view_model/settings/picker_list_item.dart';
-import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
-import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
-import 'package:cake_wallet/src/screens/settings/widgets/settings_link_provider_cell.dart';
-import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
-import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
-import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
-import 'package:cake_wallet/src/widgets/standard_list.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-
-class SettingsPage extends BasePage {
- SettingsPage(this.settingsViewModel);
-
- final SettingsViewModel settingsViewModel;
-
- @override
- String get title => S.current.settings_title;
-
- @override
- Widget body(BuildContext context) {
- // FIX-ME: Added `context` it was not used here before, maby bug ?
- return SectionStandardList(
- context: context,
- sectionCount: settingsViewModel.sections.length,
- itemCounter: (int sectionIndex) {
- if (sectionIndex < settingsViewModel.sections.length) {
- return settingsViewModel.sections[sectionIndex].length;
- }
-
- return 0;
- },
- itemBuilder: (_, sectionIndex, itemIndex) {
- final item = settingsViewModel.sections[sectionIndex][itemIndex];
-
- if (item is PickerListItem) {
- return Observer(builder: (_) {
- return SettingsPickerCell<Object>(
- displayItem: item.displayItem,
- title: item.title,
- selectedItem: item.selectedItem(),
- items: item.items,
- onItemSelected: (dynamic value) => item.onItemSelected(value),
- images: item.images,
- searchHintText: item.searchHintText,
- isGridView: item.isGridView,
- matchingCriteria: (dynamic value, String searchText) => item.matchingCriteria(value, searchText),
- );
- });
- }
-
- if (item is SwitcherListItem) {
- return Observer(builder: (_) {
- return SettingsSwitcherCell(
- title: item.title,
- value: item.value(),
- onValueChange: item.onValueChange);
- });
- }
-
- if (item is RegularListItem) {
- return SettingsCellWithArrow(
- title: item.title, handler: item.handler);
- }
-
- if (item is LinkListItem) {
- return SettingsLinkProviderCell(
- title: item.title,
- icon: item.icon,
- link: item.link,
- linkTitle: item.linkTitle);
- }
-
- if (item is VersionListItem) {
- return Observer(builder: (_) {
- return SettingsVersionCell(
- title:
- S.of(context).version(settingsViewModel.currentVersion));
- });
- }
-
- if (item is ChoicesListItem) {
- return SettingsChoicesCell(item);
- }
-
- return Container();
- });
- }
-}
diff --git a/lib/src/widgets/standard_list.dart b/lib/src/widgets/standard_list.dart
index ae8978eb4..f5abdd900 100644
--- a/lib/src/widgets/standard_list.dart
+++ b/lib/src/widgets/standard_list.dart
@@ -123,6 +123,7 @@ class SectionStandardList extends StatelessWidget {
required this.itemBuilder,
required this.sectionCount,
required BuildContext context,
+ this.dividerPadding = const EdgeInsets.only(left: 24),
this.themeColor,
this.dividerThemeColor,
this.sectionTitleBuilder,
@@ -149,6 +150,7 @@ class SectionStandardList extends StatelessWidget {
final List<Widget> totalRows;
final Color? themeColor;
final Color? dividerThemeColor;
+ final EdgeInsets dividerPadding;
List<Widget> transform(
bool hasTopSeparator,
@@ -178,7 +180,7 @@ class SectionStandardList extends StatelessWidget {
items.add(sectionIndex + 1 != sectionCount
? SectionHeaderListRow()
- : StandardListSeparator(padding: EdgeInsets.only(left: 24)));
+ : StandardListSeparator(padding: dividerPadding));
}
return items;
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index aabe51ef1..bf870af2e 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -1,11 +1,6 @@
-import 'package:cake_wallet/entities/language_service.dart';
import 'package:cake_wallet/store/yat/yat_store.dart';
-import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
-import 'package:flutter/cupertino.dart';
import 'package:mobx/mobx.dart';
import 'package:package_info/package_info.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/generated/i18n.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:cake_wallet/entities/biometric_auth.dart';
@@ -16,21 +11,12 @@ import 'package:cw_core/node.dart';
import 'package:cake_wallet/monero/monero.dart';
import 'package:cake_wallet/haven/haven.dart';
import 'package:cake_wallet/entities/action_list_display_mode.dart';
-import 'package:cake_wallet/view_model/settings/version_list_item.dart';
-import 'package:cake_wallet/view_model/settings/picker_list_item.dart';
-import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
-import 'package:cake_wallet/view_model/settings/settings_list_item.dart';
-import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
-import 'package:cake_wallet/src/screens/auth/auth_page.dart';
import 'package:cake_wallet/bitcoin/bitcoin.dart';
import 'package:cw_core/transaction_history.dart';
import 'package:cw_core/balance.dart';
import 'package:cw_core/transaction_info.dart';
import 'package:cw_core/transaction_priority.dart';
import 'package:cake_wallet/themes/theme_base.dart';
-import 'package:cake_wallet/themes/theme_list.dart';
-import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
-import 'package:cake_wallet/wallet_type_utils.dart';
part 'settings_view_model.g.dart';
@@ -59,9 +45,9 @@ abstract class SettingsViewModelBase with Store {
TransactionInfo>
wallet)
: itemHeaders = {},
- _walletType = wallet.type,
+ walletType = wallet.type,
+ _wallet = wallet,
_biometricAuth = BiometricAuth(),
- sections = <List<SettingsListItem>>[],
currentVersion = '' {
PackageInfo.fromPlatform().then(
(PackageInfo packageInfo) => currentVersion = packageInfo.version);
@@ -97,171 +83,30 @@ abstract class SettingsViewModelBase with Store {
// createNewYatUrl += '?sub1=' + createNewYatUrlParameters;
//}
-
- sections = [
- [
- SwitcherListItem(
- title: S.current.settings_display_balance,
- value: () => balanceDisplayMode == BalanceDisplayMode.displayableBalance,
- onValueChange: (_, bool value) {
- if (value) {
- _settingsStore.balanceDisplayMode = BalanceDisplayMode.displayableBalance;
- } else {
- _settingsStore.balanceDisplayMode = BalanceDisplayMode.hiddenBalance;
- }
- },
- ),
- if (!isHaven)
- PickerListItem(
- title: S.current.settings_currency,
- searchHintText: S.current.search_currency,
- items: FiatCurrency.all,
- selectedItem: () => fiatCurrency,
- onItemSelected: (FiatCurrency currency) =>
- setFiatCurrency(currency),
- images: FiatCurrency.all.map(
- (e) => Image.asset("assets/images/flags/${e.countryCode}.png"))
- .toList(),
- isGridView: true,
- matchingCriteria: (FiatCurrency currency, String searchText) {
- return currency.title.toLowerCase().contains(searchText) || currency.fullName.toLowerCase().contains(searchText);
- },
- ),
- PickerListItem(
- title: S.current.settings_fee_priority,
- items: priorityForWalletType(wallet.type),
- displayItem: (dynamic priority) {
- final _priority = priority as TransactionPriority;
-
- if (wallet.type == WalletType.bitcoin
- || wallet.type == WalletType.litecoin) {
- final rate = bitcoin!.getFeeRate(wallet, _priority);
- return bitcoin!.bitcoinTransactionPriorityWithLabel(_priority, rate);
- }
-
- return priority.toString();
- },
- selectedItem: () => transactionPriority,
- onItemSelected: (TransactionPriority priority) =>
- _settingsStore.priority[wallet.type] = priority),
- SwitcherListItem(
- title: S.current.settings_save_recipient_address,
- value: () => shouldSaveRecipientAddress,
- onValueChange: (_, bool value) =>
- setShouldSaveRecipientAddress(value))
- ],
- [
- RegularListItem(
- title: S.current.settings_change_pin,
- handler: (BuildContext context) {
- Navigator.of(context).pushNamed(Routes.auth, arguments:
- (bool isAuthenticatedSuccessfully, AuthPageState auth) {
- auth.close(
- route: isAuthenticatedSuccessfully ? Routes.setupPin : null,
- arguments: (PinCodeState<PinCodeWidget> setupPinContext,
- String _) {
- setupPinContext.close();
- },
- );
- });
- }),
- PickerListItem(
- title: S.current.settings_change_language,
- searchHintText: S.current.search_language,
- items: LanguageService.list.keys.toList(),
- displayItem: (dynamic code) {
- return LanguageService.list[code] ?? '';
- },
- selectedItem: () => _settingsStore.languageCode,
- onItemSelected: (String code) {
- _settingsStore.languageCode = code;
- },
- images: LanguageService.list.keys.map(
- (e) => Image.asset("assets/images/flags/${LanguageService.localeCountryCode[e]}.png"))
- .toList(),
- matchingCriteria: (String code, String searchText) {
- return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
- },
- ),
- SwitcherListItem(
- title: S.current.settings_allow_biometrical_authentication,
- value: () => allowBiometricalAuthentication,
- onValueChange: (BuildContext context, bool value) {
- if (value) {
- Navigator.of(context).pushNamed(Routes.auth, arguments:
- (bool isAuthenticatedSuccessfully,
- AuthPageState auth) async {
- if (isAuthenticatedSuccessfully) {
- if (await _biometricAuth.canCheckBiometrics() &&
- await _biometricAuth.isAuthenticated()) {
- setAllowBiometricalAuthentication(
- isAuthenticatedSuccessfully);
- }
- } else {
- setAllowBiometricalAuthentication(
- isAuthenticatedSuccessfully);
- }
-
- auth.close();
- });
- } else {
- setAllowBiometricalAuthentication(value);
- }
- }),
- ChoicesListItem(
- title: S.current.color_theme,
- items: ThemeList.all,
- selectedItem: theme,
- onItemSelected: (ThemeBase theme) => _settingsStore.currentTheme = theme,
- ),
- ],
- //[
- //if (_yatStore.emoji.isNotEmpty) ...[
- // LinkListItem(
- // title: S.current.manage_yats,
- // link: manageYatUrl,
- // linkTitle: ''),
- //] else ...[
- //LinkListItem(
- // title: S.current.connect_yats,
- // link: connectYatUrl,
- // linkTitle: ''),
- //LinkListItem(
- // title: 'Create new Yats',
- // link: createNewYatUrl,
- // linkTitle: '')
- //]
- //],
- [
- RegularListItem(
- title: S.current.settings_terms_and_conditions,
- handler: (BuildContext context) =>
- Navigator.of(context).pushNamed(Routes.readDisclaimer),
- )
- ],
- [VersionListItem(title: currentVersion)]
- ];
}
@observable
String currentVersion;
@computed
- Node get node => _settingsStore.getCurrentNode(_walletType);
+ Node get node => _settingsStore.getCurrentNode(walletType);
@computed
FiatCurrency get fiatCurrency => _settingsStore.fiatCurrency;
+ @computed
+ String get languageCode => _settingsStore.languageCode;
+
@computed
ObservableList<ActionListDisplayMode> get actionlistDisplayMode =>
_settingsStore.actionlistDisplayMode;
@computed
TransactionPriority get transactionPriority {
- final priority = _settingsStore.priority[_walletType];
+ final priority = _settingsStore.priority[walletType];
if (priority == null) {
- throw Exception('Unexpected type ${_walletType.toString()}');
+ throw Exception('Unexpected type ${walletType.toString()}');
}
return priority;
@@ -285,11 +130,12 @@ abstract class SettingsViewModelBase with Store {
bool get isBitcoinBuyEnabled => _settingsStore.isBitcoinBuyEnabled;
final Map<String, String> itemHeaders;
- List<List<SettingsListItem>> sections;
final SettingsStore _settingsStore;
final YatStore _yatStore;
- final WalletType _walletType;
+ final WalletType walletType;
final BiometricAuth _biometricAuth;
+ final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
+ TransactionInfo> _wallet;
@action
void setBalanceDisplayMode(BalanceDisplayMode value) =>
@@ -333,4 +179,35 @@ abstract class SettingsViewModelBase with Store {
@action
void _showTrades() => actionlistDisplayMode.add(ActionListDisplayMode.trades);
+
+ @action
+ Future<bool> biometricAuthenticated()async{
+ return await _biometricAuth.canCheckBiometrics() && await _biometricAuth.isAuthenticated();
+ }
+
+ @action
+ void onLanguageSelected (String code) {
+ _settingsStore.languageCode = code;
+ }
+
+ @action
+ void setTheme(ThemeBase newTheme){
+ _settingsStore.currentTheme = newTheme;
+ }
+
+ String getDisplayPriority(TransactionPriority priority) {
+ final _priority = priority;
+
+ if (_wallet.type == WalletType.bitcoin
+ || _wallet.type == WalletType.litecoin) {
+ final rate = bitcoin!.getFeeRate(_wallet, _priority);
+ return bitcoin!.bitcoinTransactionPriorityWithLabel(_priority, rate);
+ }
+
+ return priority.toString();
+ }
+
+ void onDisplayPrioritySelected(TransactionPriority priority) =>
+ _settingsStore.priority[_wallet.type] = priority;
+
}
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 685d817d5..cea889b15 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -651,5 +651,9 @@
"ignor": "Ignorieren",
"use_suggested": "Vorgeschlagen verwenden",
"do_not_share_warning_text" : "Teilen Sie diese nicht mit anderen, einschließlich des Supports.\n\nSie werden Ihr Geld stehlen!",
- "help": "hilfe"
+ "help": "hilfe",
+ "privacy_settings": "Datenschutzeinstellungen",
+ "privacy": "Datenschutz",
+ "display_settings": "Anzeigeeinstellungen",
+ "other_settings": "Andere Einstellungen"
}
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 877d09231..e764a0b90 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -651,5 +651,12 @@
"ignor": "Ignore",
"use_suggested": "Use Suggested",
"do_not_share_warning_text" : "Do not share these with anyone else, including support.\n\nThey will steal your money!",
- "help": "help"
+ "help": "help",
+ "connection_sync": "Connection and sync",
+ "security_and_backup": "Security and backup",
+ "create_backup": "Create backup",
+ "privacy_settings": "Privacy settings",
+ "privacy": "Privacy",
+ "display_settings": "Display settings",
+ "other_settings": "Other settings"
}
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 505f3ffa8..bd43abe58 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -651,5 +651,9 @@
"ignor": "Pasar por alto",
"use_suggested": "Usar sugerido",
"do_not_share_warning_text" : "No comparta estos con nadie más, incluido el soporte.\n\n¡Te robarán tu dinero!",
- "help": "ayuda"
+ "help": "ayuda",
+ "privacy_settings": "Configuración de privacidad",
+ "privacy": "Privacidad",
+ "display_settings": "Configuración de pantalla",
+ "other_settings": "Otras configuraciones"
}
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 941016c0b..df43f41a6 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -649,5 +649,9 @@
"ignor": "Ignorer",
"use_suggested": "Utilisation suggérée",
"do_not_share_warning_text" : "Ne les partagez avec personne d'autre, y compris avec l'assistance.\n\nIls vont voler votre argent!",
- "help": "aider"
+ "help": "aider",
+ "privacy_settings": "Paramètres de confidentialité",
+ "privacy": "Confidentialité",
+ "display_settings": "Paramètres d'affichage",
+ "other_settings": "Autres paramètres"
}
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 7faa06f7f..06d95d3b2 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -651,5 +651,9 @@
"ignor": "नज़रअंदाज़ करना",
"use_suggested": "सुझाए गए का प्रयोग करें",
"do_not_share_warning_text" : "इन्हें समर्थन सहित किसी और के साथ साझा न करें।\n\nवे आपका पैसा चुरा लेंगे!",
- "help": "मदद करना"
+ "help": "मदद करना",
+ "privacy_settings": "गोपनीयता सेटिंग्स",
+ "privacy": "गोपनीयता",
+ "display_settings": "प्रदर्शन सेटिंग्स",
+ "other_settings": "अन्य सेटिंग्स"
}
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 4fa77948a..7c25928e5 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -651,5 +651,9 @@
"ignor": "Zanemariti",
"use_suggested": "Koristite predloženo",
"do_not_share_warning_text" : "Nemojte ih dijeliti ni s kim, uključujući podršku.\n\nUkrast će vam novac!",
- "help": "pomozite"
+ "help": "pomozite",
+ "privacy_settings": "Postavke privatnosti",
+ "privacy": "Privatnost",
+ "display_settings": "Postavke zaslona",
+ "other_settings": "Ostale postavke"
}
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 9a42a588b..45d9d8164 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -651,5 +651,9 @@
"ignor": "Ignorare",
"use_suggested": "Usa suggerito",
"do_not_share_warning_text" : "Non condividerli con nessun altro, incluso il supporto.\n\nTi ruberanno i soldi!",
- "help": "aiuto"
+ "help": "aiuto",
+ "privacy_settings": "Impostazioni privacy",
+ "privacy": "Privacy",
+ "display_settings": "Impostazioni di visualizzazione",
+ "other_settings": "Altre impostazioni"
}
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index c1d0de4e3..ffb2cbb71 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -651,5 +651,9 @@
"ignor": "無視",
"use_suggested": "推奨を使用",
"do_not_share_warning_text" : "サポートを含め、これらを他の誰とも共有しないでください。\n\n彼らはあなたのお金を盗みます！",
- "help": "ヘルプ"
+ "help": "ヘルプ",
+ "privacy_settings": "プライバシー設定",
+ "privacy": "プライバシー",
+ "display_settings": "表示設定",
+ "other_settings": "その他の設定"
}
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 127aa949e..598fe2f56 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -651,5 +651,9 @@
"ignor": "무시하다",
"use_suggested": "추천 사용",
"do_not_share_warning_text" : "지원을 포함하여 다른 사람과 이러한 정보를 공유하지 마십시오.\n\n그들은 당신의 돈을 훔칠 것입니다!",
- "help": "돕다"
+ "help": "돕다",
+ "privacy_settings": "개인정보 설정",
+ "privacy": "프라이버시",
+ "display_settings": "디스플레이 설정",
+ "other_settings": "기타 설정"
}
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index fa748b552..12e2f5569 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -651,5 +651,9 @@
"ignor": "Negeren",
"use_suggested": "Gebruik aanbevolen",
"do_not_share_warning_text" : "Deel deze met niemand anders, ook niet met support.\n\nZe zullen je geld stelen!",
- "help": "helpen"
+ "help": "helpen",
+ "privacy_settings": "Privacy-instellingen",
+ "privacy": "Privacy",
+ "display_settings": "Weergave-instellingen",
+ "other_settings": "Andere instellingen"
}
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 454fe9717..fd092d332 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -651,5 +651,9 @@
"ignor": "Ignorować",
"use_suggested": "Użyj sugerowane",
"do_not_share_warning_text" : "Nie udostępniaj ich nikomu innemu, w tym wsparcia.\n\nUkradną twoje pieniądze!",
- "help": "pomoc"
+ "help": "pomoc",
+ "privacy_settings": "Ustawienia prywatności",
+ "privacy": "Prywatność",
+ "display_settings": "Ustawienia wyświetlania",
+ "other_settings": "Inne ustawienia"
}
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 04a0a3ff2..e4d7ef647 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -651,5 +651,9 @@
"ignor": "Ignorar",
"use_suggested": "Uso sugerido",
"do_not_share_warning_text" : "Não os compartilhe com mais ninguém, incluindo suporte.\n\nEles vão roubar seu dinheiro!",
- "help": "ajuda"
+ "help": "ajuda",
+ "privacy_settings": "Configurações de privacidade",
+ "privacy": "Privacidade",
+ "display_settings": "Configurações de exibição",
+ "other_settings": "Outras configurações"
}
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 632b0990c..786f11e36 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -651,5 +651,9 @@
"ignor": "Игнорировать",
"use_suggested": "Использовать предложенный",
"do_not_share_warning_text" : "Не делитесь ими с кем-либо еще, в том числе со службой поддержки.\n\nОни украдут ваши деньги!",
- "help": "помощь"
+ "help": "помощь",
+ "privacy_settings": "Настройки конфиденциальности",
+ "privacy": "Конфиденциальность",
+ "display_settings": "Настройки отображения",
+ "other_settings": "Другие настройки"
}
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 5e0f0d18a..48951e806 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -650,5 +650,10 @@
"ignor": "Ігнорувати",
"use_suggested": "Використати запропоноване",
"do_not_share_warning_text" : "Не повідомляйте їх нікому, включно зі службою підтримки.\n\nВони вкрадуть ваші гроші!",
- "help": "допомога"
+ "help": "допомога",
+ "privacy_settings": "Налаштування конфіденційності",
+ "privacy": "Конфіденційність",
+ "display_settings": "Налаштування дисплея",
+ "other_settings": "Інші налаштування"
+
}
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index c46d07d59..29d7351d5 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -649,5 +649,9 @@
"ignor": "忽视",
"use_suggested": "使用建议",
"do_not_share_warning_text" : "不要與其他任何人分享這些內容，包括支持。\n\n他們會偷你的錢！",
- "help": "帮助"
+ "help": "帮助",
+ "privacy_settings": "隐私设置",
+ "privacy":"隐私",
+ "display_settings": "显示设置",
+ "other_settings": "其他设置"
}
From 91d7e87334d9374904c0bf3098510a8c5c20d1a2 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Wed, 16 Nov 2022 23:31:42 +0200
Subject: [PATCH 16/90] fix gift card filter colors
---
lib/src/screens/ionia/cards/ionia_manage_cards_page.dart | 2 +-
lib/src/screens/ionia/widgets/ionia_filter_modal.dart | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart b/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart
index 2fbb1d57d..1c13f7a88 100644
--- a/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart
@@ -118,7 +118,7 @@ class IoniaManageCardsPage extends BasePage {
width: 32,
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
- color: Colors.white.withOpacity(0.15),
+ color: Theme.of(context).textTheme!.headline6!.backgroundColor!,
border: Border.all(
color: Colors.white.withOpacity(0.2),
),
diff --git a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart
index ec6e84cc0..2b885f736 100644
--- a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart
+++ b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart
@@ -20,7 +20,7 @@ class IoniaFilterModal extends StatelessWidget {
padding: EdgeInsets.all(10),
child: Image.asset(
'assets/images/mini_search_icon.png',
- color: Theme.of(context).accentColor,
+ color: Theme.of(context).textTheme.subtitle2!.color!,
),
);
return Scaffold(
@@ -53,7 +53,7 @@ class IoniaFilterModal extends StatelessWidget {
prefixIcon: searchIcon,
hintText: S.of(context).search_category,
contentPadding: EdgeInsets.only(bottom: 5),
- fillColor: Theme.of(context).textTheme!.subtitle1!.backgroundColor!,
+ fillColor: Theme.of(context).primaryTextTheme!.caption!.decorationColor!.withOpacity(0.5),
border: OutlineInputBorder(
borderSide: BorderSide.none,
borderRadius: BorderRadius.circular(8),
From ab305e22a23c9f2930a538a1110ca1c9eb3ee24a Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 16 Nov 2022 18:30:35 -0500
Subject: [PATCH 17/90] Remove duplication for qr codes. (#628)
---
lib/src/screens/receive/widgets/qr_painter.dart | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/src/screens/receive/widgets/qr_painter.dart b/lib/src/screens/receive/widgets/qr_painter.dart
index 90dba73ac..e4af59f1a 100644
--- a/lib/src/screens/receive/widgets/qr_painter.dart
+++ b/lib/src/screens/receive/widgets/qr_painter.dart
@@ -9,7 +9,6 @@ class QrPainter extends CustomPainter {
this.errorCorrectionLevel,
) : this._qr = QrCode(version, errorCorrectionLevel)..addData(data) {
_p.color = this.color;
- _qr.addData(data);
_qrImage = QrImage(_qr);
}
From 35007fcf3ecc3dbac44ae8b2e9e3bb904bef653e Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 16 Nov 2022 18:33:12 -0500
Subject: [PATCH 18/90] Update version to 4.5.1 for cakewallet; 1.2.1 for
monero.com. (#629)
---
scripts/android/app_env.sh | 8 ++++----
scripts/ios/app_env.sh | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 54ad0b4d4..e57d3a97c 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
APP_ANDROID_TYPE=$1
MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.2.0"
-MONERO_COM_BUILD_NUMBER=28
+MONERO_COM_VERSION="1.2.1"
+MONERO_COM_BUILD_NUMBER=29
MONERO_COM_BUNDLE_ID="com.monero.app"
MONERO_COM_PACKAGE="com.monero.app"
CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.5.0"
-CAKEWALLET_BUILD_NUMBER=132
+CAKEWALLET_VERSION="4.5.1"
+CAKEWALLET_BUILD_NUMBER=133
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index c7ecaa60b..8bb945680 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
APP_IOS_TYPE=$1
MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.2.0"
-MONERO_COM_BUILD_NUMBER=28
+MONERO_COM_VERSION="1.2.1"
+MONERO_COM_BUILD_NUMBER=29
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.5.0"
-CAKEWALLET_BUILD_NUMBER=132
+CAKEWALLET_VERSION="4.5.1"
+CAKEWALLET_BUILD_NUMBER=133
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
HAVEN_NAME="Haven"
From 3dbdb8fceaa77c33dbc0ff58484c411ee5ee4a77 Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 16 Nov 2022 20:15:30 -0500
Subject: [PATCH 19/90] Update targetSdkVersion to 31. (#630)
---
android/app/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 74cd0f8f7..00cef6393 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -46,7 +46,7 @@ android {
defaultConfig {
applicationId appProperties['id']
minSdkVersion 21
- targetSdkVersion 30
+ targetSdkVersion 31
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
From 91941e7c80fc01141b7215afe3f918ed92cfdaf4 Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 16 Nov 2022 20:19:23 -0500
Subject: [PATCH 20/90] Update build number for android cakewallet to 134;
monero.com to 30. (#631)
---
scripts/android/app_env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index e57d3a97c..1cb3084cf 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -15,13 +15,13 @@ APP_ANDROID_TYPE=$1
MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.2.1"
-MONERO_COM_BUILD_NUMBER=29
+MONERO_COM_BUILD_NUMBER=30
MONERO_COM_BUNDLE_ID="com.monero.app"
MONERO_COM_PACKAGE="com.monero.app"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.5.1"
-CAKEWALLET_BUILD_NUMBER=133
+CAKEWALLET_BUILD_NUMBER=134
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
From 841b69aef743b8d984ff81de817735072104de31 Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 16 Nov 2022 21:55:26 -0500
Subject: [PATCH 21/90] Android exported (#632)
* Add android:exported="true" to android activity.
* Update build version for android for cakewallet to 135; monero.com 31.
---
android/app/src/main/AndroidManifestBase.xml | 3 ++-
scripts/android/app_env.sh | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/android/app/src/main/AndroidManifestBase.xml b/android/app/src/main/AndroidManifestBase.xml
index f43b0369b..22278d5f1 100644
--- a/android/app/src/main/AndroidManifestBase.xml
+++ b/android/app/src/main/AndroidManifestBase.xml
@@ -21,7 +21,8 @@
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize"
- android:screenOrientation="portrait">
+ android:screenOrientation="portrait"
+ android:exported="true">
<meta-data
android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background"
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 1cb3084cf..51e9fcdec 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -15,13 +15,13 @@ APP_ANDROID_TYPE=$1
MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.2.1"
-MONERO_COM_BUILD_NUMBER=30
+MONERO_COM_BUILD_NUMBER=31
MONERO_COM_BUNDLE_ID="com.monero.app"
MONERO_COM_PACKAGE="com.monero.app"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.5.1"
-CAKEWALLET_BUILD_NUMBER=134
+CAKEWALLET_BUILD_NUMBER=135
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
From 3d836d5dce6bda9102b783539f24addcd06abeda Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 16 Nov 2022 22:00:59 -0500
Subject: [PATCH 22/90] Update android build version for cakewallet to 136;
monero.com 32. (#633)
---
scripts/android/app_env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 51e9fcdec..d361c8dfa 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -15,13 +15,13 @@ APP_ANDROID_TYPE=$1
MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.2.1"
-MONERO_COM_BUILD_NUMBER=31
+MONERO_COM_BUILD_NUMBER=32
MONERO_COM_BUNDLE_ID="com.monero.app"
MONERO_COM_PACKAGE="com.monero.app"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.5.1"
-CAKEWALLET_BUILD_NUMBER=135
+CAKEWALLET_BUILD_NUMBER=136
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
From a82803de3ae6902cd94b0ec0348d5726404cb62a Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Fri, 18 Nov 2022 20:32:52 +0200
Subject: [PATCH 23/90] Fix Casting issue
---
lib/view_model/settings/settings_view_model.dart | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index bf870af2e..359ebfaf5 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -180,7 +180,7 @@ abstract class SettingsViewModelBase with Store {
@action
void _showTrades() => actionlistDisplayMode.add(ActionListDisplayMode.trades);
- @action
+ @action
Future<bool> biometricAuthenticated()async{
return await _biometricAuth.canCheckBiometrics() && await _biometricAuth.isAuthenticated();
}
@@ -195,8 +195,8 @@ abstract class SettingsViewModelBase with Store {
_settingsStore.currentTheme = newTheme;
}
- String getDisplayPriority(TransactionPriority priority) {
- final _priority = priority;
+ String getDisplayPriority(dynamic priority) {
+ final _priority = priority as TransactionPriority;
if (_wallet.type == WalletType.bitcoin
|| _wallet.type == WalletType.litecoin) {
From c67e8c5037e4aafea5da830db30dd68a5dd85b89 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Fri, 18 Nov 2022 20:53:35 +0200
Subject: [PATCH 24/90] [CW-233] Fix missing display balance setting
---
lib/di.dart | 8 ++++----
lib/router.dart | 8 ++++----
lib/src/screens/dashboard/dashboard_page.dart | 2 +-
lib/src/screens/settings/display_settings_page.dart | 10 +++++-----
lib/src/screens/settings/other_settings_page.dart | 2 +-
lib/view_model/settings/settings_view_model.dart | 12 ++++++++++++
6 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/lib/di.dart b/lib/di.dart
index 265a5036b..815a3740e 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -5,10 +5,10 @@ import 'package:cake_wallet/ionia/ionia_anypay.dart';
import 'package:cake_wallet/ionia/ionia_gift_card.dart';
import 'package:cake_wallet/ionia/ionia_tip.dart';
import 'package:cake_wallet/src/screens/buy/onramper_page.dart';
-import 'package:cake_wallet/src/screens/setting/display_settings_page.dart';
-import 'package:cake_wallet/src/screens/setting/other_settings_page.dart';
-import 'package:cake_wallet/src/screens/setting/privacy_page.dart';
-import 'package:cake_wallet/src/screens/setting/security_backup_page.dart';
+import 'package:cake_wallet/src/screens/settings/display_settings_page.dart';
+import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
+import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
+import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_gift_card_detail_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_more_options_page.dart';
diff --git a/lib/router.dart b/lib/router.dart
index e35ba19ef..7818cc52f 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -5,10 +5,10 @@ import 'package:cake_wallet/src/screens/backup/edit_backup_password_page.dart';
import 'package:cake_wallet/src/screens/buy/buy_webview_page.dart';
import 'package:cake_wallet/src/screens/buy/onramper_page.dart';
import 'package:cake_wallet/src/screens/buy/pre_order_page.dart';
-import 'package:cake_wallet/src/screens/setting/display_settings_page.dart';
-import 'package:cake_wallet/src/screens/setting/other_settings_page.dart';
-import 'package:cake_wallet/src/screens/setting/privacy_page.dart';
-import 'package:cake_wallet/src/screens/setting/security_backup_page.dart';
+import 'package:cake_wallet/src/screens/settings/display_settings_page.dart';
+import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
+import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
+import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_cards_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart';
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index f3d5a21fb..cb90bb8e0 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -60,7 +60,7 @@ class DashboardPage extends BasePage {
Widget middle(BuildContext context) {
return SyncIndicator(dashboardViewModel: walletViewModel,
onTap: () => Navigator.of(context, rootNavigator: true)
- .pushNamed(Routes.nodeList));
+ .pushNamed(Routes.connectionSync));
}
@override
diff --git a/lib/src/screens/settings/display_settings_page.dart b/lib/src/screens/settings/display_settings_page.dart
index a5a855b59..0c18ce09a 100644
--- a/lib/src/screens/settings/display_settings_page.dart
+++ b/lib/src/screens/settings/display_settings_page.dart
@@ -29,11 +29,11 @@ class DisplaySettingsPage extends BasePage {
child: Column(
children: [
SettingsSwitcherCell(
- title: S.current.settings_save_recipient_address,
- value: settingsViewModel.shouldSaveRecipientAddress,
- onValueChange: (BuildContext _, bool value) {
- settingsViewModel.setShouldSaveRecipientAddress(value);
- }),
+ title: S.current.settings_display_balance,
+ value: settingsViewModel.shouldDisplayBalance,
+ onValueChange: (_, bool value) {
+ settingsViewModel.setShouldDisplayBalance(value);
+ }),
if (!isHaven)
SettingsPickerCell<FiatCurrency>(
title: S.current.settings_currency,
diff --git a/lib/src/screens/settings/other_settings_page.dart b/lib/src/screens/settings/other_settings_page.dart
index 7d1ec311d..65d976708 100644
--- a/lib/src/screens/settings/other_settings_page.dart
+++ b/lib/src/screens/settings/other_settings_page.dart
@@ -24,7 +24,7 @@ class OtherSettingsPage extends BasePage {
return Container(
padding: EdgeInsets.only(top: 10),
child: Column(children: [
- SettingsPickerCell<TransactionPriority>(
+ SettingsPickerCell(
title: S.current.settings_fee_priority,
items: priorityForWalletType(_settingsViewModel.walletType),
displayItem: _settingsViewModel.getDisplayPriority,
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index 359ebfaf5..9caacb211 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -116,6 +116,9 @@ abstract class SettingsViewModelBase with Store {
BalanceDisplayMode get balanceDisplayMode =>
_settingsStore.balanceDisplayMode;
+ @computed
+ bool get shouldDisplayBalance => balanceDisplayMode == BalanceDisplayMode.displayableBalance;
+
@computed
bool get shouldSaveRecipientAddress =>
_settingsStore.shouldSaveRecipientAddress;
@@ -195,6 +198,15 @@ abstract class SettingsViewModelBase with Store {
_settingsStore.currentTheme = newTheme;
}
+ @action
+ void setShouldDisplayBalance(bool value){
+ if (value) {
+ _settingsStore.balanceDisplayMode = BalanceDisplayMode.displayableBalance;
+ } else {
+ _settingsStore.balanceDisplayMode = BalanceDisplayMode.hiddenBalance;
+ }
+ }
+
String getDisplayPriority(dynamic priority) {
final _priority = priority as TransactionPriority;
From 05f1b17a732932ed12b2b93b751acf218160214b Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Mon, 21 Nov 2022 22:41:09 +0200
Subject: [PATCH 25/90] fix contact list bug
---
lib/router.dart | 2 +-
lib/src/screens/contact/contact_list_page.dart | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/router.dart b/lib/router.dart
index 8b43fbaf5..9fe22e22d 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -300,7 +300,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.addressBook:
return MaterialPageRoute<void>(
builder: (_) =>
- getIt.get<ContactListPage>(param1: true, param2: null));
+ getIt.get<ContactListPage>(param1: true));
case Routes.pickerAddressBook:
final selectedCurrency = settings.arguments as CryptoCurrency;
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 6d23518b8..8e9de23fd 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -68,7 +68,9 @@ class ContactListPage extends BasePage {
contactListViewModel.getWallets(isEditable, selectedCurrency);
return Container(
padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
- child: CollapsibleSectionList(
+ child: Observer(
+ builder: (_) {
+ return CollapsibleSectionList(
context: context,
sectionCount: 2,
themeColor: Theme.of(context).primaryTextTheme.headline6!.color!,
@@ -104,7 +106,7 @@ class ContactListPage extends BasePage {
child: content,
);
},
- )
+ );})
);
}
From 2db75344802296ad6fe0d68c4bcedc997e9263af Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Tue, 22 Nov 2022 00:07:27 +0200
Subject: [PATCH 26/90] small fix
---
lib/src/screens/contact/contact_list_page.dart | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 8e9de23fd..7895a1df3 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -62,14 +62,15 @@ class ContactListPage extends BasePage {
@override
Widget body(BuildContext context) {
- final contacts =
- contactListViewModel.getContacts(isEditable, selectedCurrency);
- final walletContacts =
- contactListViewModel.getWallets(isEditable, selectedCurrency);
+
return Container(
padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
child: Observer(
builder: (_) {
+ final contacts =
+ contactListViewModel.getContacts(isEditable, selectedCurrency);
+ final walletContacts =
+ contactListViewModel.getWallets(isEditable, selectedCurrency);
return CollapsibleSectionList(
context: context,
sectionCount: 2,
From bcf09b048c635206e978ea1628ecb23201228c99 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Tue, 22 Nov 2022 03:52:03 +0200
Subject: [PATCH 27/90] Cw 220 fix grey exchange screen (#641)
* Fix nullability issue for ChangeNow rateId
* Handle concurrent modification error from Splay Tree
---
.../exchange/exchange_view_model.dart | 158 +++++++++---------
1 file changed, 83 insertions(+), 75 deletions(-)
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index e7e73855b..725208324 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -7,7 +7,6 @@ import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart'
import 'package:cake_wallet/exchange/sideshift/sideshift_request.dart';
import 'package:cake_wallet/exchange/simpleswap/simpleswap_exchange_provider.dart';
import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
-import 'package:cw_core/transaction_priority.dart';
import 'package:cake_wallet/exchange/simpleswap/simpleswap_request.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/crypto_currency.dart';
@@ -375,96 +374,105 @@ abstract class ExchangeViewModelBase with Store {
TradeRequest? request;
String amount = '';
- for (var provider in _sortedAvailableProviders.values) {
- if (!(await provider.checkIsAvailable())) {
- continue;
- }
+ try {
+ for (var provider in _sortedAvailableProviders.values) {
+ if (!(await provider.checkIsAvailable())) {
+ continue;
+ }
- if (provider is SideShiftExchangeProvider) {
- request = SideShiftRequest(
- depositMethod: depositCurrency,
- settleMethod: receiveCurrency,
- depositAmount: depositAmount.replaceAll(',', '.'),
- settleAddress: receiveAddress,
- refundAddress: depositAddress,
- );
- amount = depositAmount;
- }
+ if (provider is SideShiftExchangeProvider) {
+ request = SideShiftRequest(
+ depositMethod: depositCurrency,
+ settleMethod: receiveCurrency,
+ depositAmount: depositAmount.replaceAll(',', '.'),
+ settleAddress: receiveAddress,
+ refundAddress: depositAddress,
+ );
+ amount = depositAmount;
+ }
- if (provider is SimpleSwapExchangeProvider) {
- request = SimpleSwapRequest(
- from: depositCurrency,
- to: receiveCurrency,
- amount: depositAmount.replaceAll(',', '.'),
- address: receiveAddress,
- refundAddress: depositAddress,
- );
- amount = depositAmount;
- }
-
- if (provider is XMRTOExchangeProvider) {
- request = XMRTOTradeRequest(
+ if (provider is SimpleSwapExchangeProvider) {
+ request = SimpleSwapRequest(
from: depositCurrency,
to: receiveCurrency,
amount: depositAmount.replaceAll(',', '.'),
- receiveAmount: receiveAmount.replaceAll(',', '.'),
address: receiveAddress,
refundAddress: depositAddress,
- isBTCRequest: isReceiveAmountEntered);
- amount = depositAmount;
- }
+ );
+ amount = depositAmount;
+ }
- if (provider is ChangeNowExchangeProvider) {
- request = ChangeNowRequest(
- from: depositCurrency,
- to: receiveCurrency,
- fromAmount: depositAmount.replaceAll(',', '.'),
- toAmount: receiveAmount.replaceAll(',', '.'),
- refundAddress: depositAddress,
- address: receiveAddress,
- isReverse: isReverse);
- amount = isReverse ? receiveAmount : depositAmount;
- }
+ if (provider is XMRTOExchangeProvider) {
+ request = XMRTOTradeRequest(
+ from: depositCurrency,
+ to: receiveCurrency,
+ amount: depositAmount.replaceAll(',', '.'),
+ receiveAmount: receiveAmount.replaceAll(',', '.'),
+ address: receiveAddress,
+ refundAddress: depositAddress,
+ isBTCRequest: isReceiveAmountEntered);
+ amount = depositAmount;
+ }
- if (provider is MorphTokenExchangeProvider) {
- request = MorphTokenRequest(
- from: depositCurrency,
- to: receiveCurrency,
- amount: depositAmount.replaceAll(',', '.'),
- refundAddress: depositAddress,
- address: receiveAddress);
- amount = depositAmount;
- }
+ if (provider is ChangeNowExchangeProvider) {
+ request = ChangeNowRequest(
+ from: depositCurrency,
+ to: receiveCurrency,
+ fromAmount: depositAmount.replaceAll(',', '.'),
+ toAmount: receiveAmount.replaceAll(',', '.'),
+ refundAddress: depositAddress,
+ address: receiveAddress,
+ isReverse: isReverse);
+ amount = isReverse ? receiveAmount : depositAmount;
+ }
- amount = amount.replaceAll(',', '.');
+ if (provider is MorphTokenExchangeProvider) {
+ request = MorphTokenRequest(
+ from: depositCurrency,
+ to: receiveCurrency,
+ amount: depositAmount.replaceAll(',', '.'),
+ refundAddress: depositAddress,
+ address: receiveAddress);
+ amount = depositAmount;
+ }
- if (limitsState is LimitsLoadedSuccessfully) {
- if (double.parse(amount) < limits.min!) {
- continue;
- } else if (limits.max != null && double.parse(amount) > limits.max!) {
- continue;
- } else {
- try {
- tradeState = TradeIsCreating();
- final trade = await provider.createTrade(
- request: request!, isFixedRateMode: isFixedRateMode);
- trade.walletId = wallet.id;
- tradesStore.setTrade(trade);
- await trades.add(trade);
- tradeState = TradeIsCreatedSuccessfully(trade: trade);
- /// return after the first successful trade
- return;
- } catch (e) {
+ amount = amount.replaceAll(',', '.');
+
+ if (limitsState is LimitsLoadedSuccessfully) {
+ if (double.parse(amount) < limits.min!) {
continue;
+ } else if (limits.max != null && double.parse(amount) > limits.max!) {
+ continue;
+ } else {
+ try {
+ tradeState = TradeIsCreating();
+ final trade = await provider.createTrade(
+ request: request!, isFixedRateMode: isFixedRateMode);
+ trade.walletId = wallet.id;
+ tradesStore.setTrade(trade);
+ await trades.add(trade);
+ tradeState = TradeIsCreatedSuccessfully(trade: trade);
+ /// return after the first successful trade
+ return;
+ } catch (e) {
+ continue;
+ }
}
}
}
- }
- /// if the code reached here then none of the providers succeeded
- tradeState = TradeIsCreatedFailure(
- title: S.current.trade_not_created,
- error: S.current.none_of_selected_providers_can_exchange);
+ /// if the code reached here then none of the providers succeeded
+ tradeState = TradeIsCreatedFailure(
+ title: S.current.trade_not_created,
+ error: S.current.none_of_selected_providers_can_exchange);
+ } on ConcurrentModificationError {
+ /// if create trade happened at the exact same time of the scheduled rate update
+ /// then delay the create trade a bit and try again
+ ///
+ /// this is because the limitation of the SplayTreeMap that
+ /// you can't modify it while iterating through it
+ Future.delayed(Duration(milliseconds: 500), createTrade);
+ }
}
@action
From 9b32c9c95666093841621b4753b0de40e8a19f37 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Tue, 22 Nov 2022 04:18:18 +0200
Subject: [PATCH 28/90] CW-227 Add Disable Exchange option to settings (#642)
* Add Disable Exchange option to settings
---
lib/entities/preferences_key.dart | 1 +
lib/src/screens/dashboard/dashboard_page.dart | 4 +++-
lib/store/settings_store.dart | 8 ++++++++
lib/view_model/dashboard/dashboard_view_model.dart | 6 ++----
lib/view_model/settings/settings_view_model.dart | 6 ++++++
res/values/strings_de.arb | 3 ++-
res/values/strings_en.arb | 3 ++-
res/values/strings_es.arb | 3 ++-
res/values/strings_fr.arb | 3 ++-
res/values/strings_hi.arb | 3 ++-
res/values/strings_hr.arb | 3 ++-
res/values/strings_it.arb | 3 ++-
res/values/strings_ja.arb | 3 ++-
res/values/strings_ko.arb | 3 ++-
res/values/strings_nl.arb | 3 ++-
res/values/strings_pl.arb | 3 ++-
res/values/strings_pt.arb | 3 ++-
res/values/strings_ru.arb | 3 ++-
res/values/strings_uk.arb | 3 ++-
res/values/strings_zh.arb | 3 ++-
20 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/lib/entities/preferences_key.dart b/lib/entities/preferences_key.dart
index 6cf7e5608..a28410192 100644
--- a/lib/entities/preferences_key.dart
+++ b/lib/entities/preferences_key.dart
@@ -11,6 +11,7 @@ class PreferencesKey {
static const shouldSaveRecipientAddressKey = 'save_recipient_address';
static const allowBiometricalAuthenticationKey =
'allow_biometrical_authentication';
+ static const disableExchangeKey = 'disable_exchange';
static const currentTheme = 'current_theme';
static const isDarkThemeLegacy = 'dark_theme';
static const displayActionListModeKey = 'display_list_mode';
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index f3d5a21fb..fe8414134 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -315,6 +315,8 @@ class DashboardPage extends BasePage {
}
Future<void> _onClickExchangeButton(BuildContext context) async {
- await Navigator.of(context).pushNamed(Routes.exchange);
+ if (walletViewModel.isEnabledExchangeAction) {
+ await Navigator.of(context).pushNamed(Routes.exchange);
+ }
}
}
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index 2b3105a34..534ea67e9 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -30,6 +30,7 @@ abstract class SettingsStoreBase with Store {
required BalanceDisplayMode initialBalanceDisplayMode,
required bool initialSaveRecipientAddress,
required bool initialAllowBiometricalAuthentication,
+ required bool initialExchangeEnabled,
required ThemeBase initialTheme,
required int initialPinLength,
required String initialLanguageCode,
@@ -47,6 +48,7 @@ abstract class SettingsStoreBase with Store {
balanceDisplayMode = initialBalanceDisplayMode,
shouldSaveRecipientAddress = initialSaveRecipientAddress,
allowBiometricalAuthentication = initialAllowBiometricalAuthentication,
+ disableExchange = initialExchangeEnabled,
currentTheme = initialTheme,
pinCodeLength = initialPinLength,
languageCode = initialLanguageCode,
@@ -143,6 +145,9 @@ abstract class SettingsStoreBase with Store {
@observable
bool allowBiometricalAuthentication;
+ @observable
+ bool disableExchange;
+
@observable
ThemeBase currentTheme;
@@ -221,6 +226,8 @@ abstract class SettingsStoreBase with Store {
final allowBiometricalAuthentication = sharedPreferences
.getBool(PreferencesKey.allowBiometricalAuthenticationKey) ??
false;
+ final disableExchange = sharedPreferences
+ .getBool(PreferencesKey.disableExchangeKey) ?? false;
final legacyTheme =
(sharedPreferences.getBool(PreferencesKey.isDarkThemeLegacy) ?? false)
? ThemeType.dark.index
@@ -284,6 +291,7 @@ abstract class SettingsStoreBase with Store {
initialBalanceDisplayMode: currentBalanceDisplayMode,
initialSaveRecipientAddress: shouldSaveRecipientAddress,
initialAllowBiometricalAuthentication: allowBiometricalAuthentication,
+ initialExchangeEnabled: disableExchange,
initialTheme: savedTheme,
actionlistDisplayMode: actionListDisplayMode,
initialPinLength: pinLength,
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index 49dd2437a..7f11b0c2f 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -53,7 +53,6 @@ abstract class DashboardViewModelBase with Store {
hasBuyAction = false,
isEnabledBuyAction = false,
hasExchangeAction = false,
- isEnabledExchangeAction = false,
isShowFirstYatIntroduction = false,
isShowSecondYatIntroduction = false,
isShowThirdYatIntroduction = false,
@@ -249,8 +248,8 @@ abstract class DashboardViewModelBase with Store {
void furtherShowYatPopup(bool shouldShow) =>
settingsStore.shouldShowYatPopup = shouldShow;
- @observable
- bool isEnabledExchangeAction;
+ @computed
+ bool get isEnabledExchangeAction => !settingsStore.disableExchange;
@observable
bool hasExchangeAction;
@@ -365,7 +364,6 @@ abstract class DashboardViewModelBase with Store {
}
void updateActions() {
- isEnabledExchangeAction = true;
hasExchangeAction = !isHaven;
isEnabledBuyAction = wallet.type != WalletType.haven
&& wallet.type != WalletType.monero;
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index aabe51ef1..f85d2c459 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -208,6 +208,12 @@ abstract class SettingsViewModelBase with Store {
setAllowBiometricalAuthentication(value);
}
}),
+ SwitcherListItem(
+ title: S.current.disable_exchange,
+ value: () => _settingsStore.disableExchange,
+ onValueChange: (BuildContext context, bool value) {
+ _settingsStore.disableExchange = value;
+ }),
ChoicesListItem(
title: S.current.color_theme,
items: ThemeList.all,
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 685d817d5..f5170b84e 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -651,5 +651,6 @@
"ignor": "Ignorieren",
"use_suggested": "Vorgeschlagen verwenden",
"do_not_share_warning_text" : "Teilen Sie diese nicht mit anderen, einschließlich des Supports.\n\nSie werden Ihr Geld stehlen!",
- "help": "hilfe"
+ "help": "hilfe",
+ "disable_exchange": "Exchange deaktivieren"
}
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 877d09231..b62dbd984 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -651,5 +651,6 @@
"ignor": "Ignore",
"use_suggested": "Use Suggested",
"do_not_share_warning_text" : "Do not share these with anyone else, including support.\n\nThey will steal your money!",
- "help": "help"
+ "help": "help",
+ "disable_exchange": "Disable exchange"
}
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 505f3ffa8..beff1af8d 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -651,5 +651,6 @@
"ignor": "Pasar por alto",
"use_suggested": "Usar sugerido",
"do_not_share_warning_text" : "No comparta estos con nadie más, incluido el soporte.\n\n¡Te robarán tu dinero!",
- "help": "ayuda"
+ "help": "ayuda",
+ "disable_exchange": "Deshabilitar intercambio"
}
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 941016c0b..fa1d01e22 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -649,5 +649,6 @@
"ignor": "Ignorer",
"use_suggested": "Utilisation suggérée",
"do_not_share_warning_text" : "Ne les partagez avec personne d'autre, y compris avec l'assistance.\n\nIls vont voler votre argent!",
- "help": "aider"
+ "help": "aider",
+ "disable_exchange": "Désactiver l'échange"
}
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 7faa06f7f..c7b6ece40 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -651,5 +651,6 @@
"ignor": "नज़रअंदाज़ करना",
"use_suggested": "सुझाए गए का प्रयोग करें",
"do_not_share_warning_text" : "इन्हें समर्थन सहित किसी और के साथ साझा न करें।\n\nवे आपका पैसा चुरा लेंगे!",
- "help": "मदद करना"
+ "help": "मदद करना",
+ "disable_exchange": "एक्सचेंज अक्षम करें"
}
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 4fa77948a..532a4d63a 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -651,5 +651,6 @@
"ignor": "Zanemariti",
"use_suggested": "Koristite predloženo",
"do_not_share_warning_text" : "Nemojte ih dijeliti ni s kim, uključujući podršku.\n\nUkrast će vam novac!",
- "help": "pomozite"
+ "help": "pomozite",
+ "disable_exchange": "Onemogući exchange"
}
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 9a42a588b..cb5209fc3 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -651,5 +651,6 @@
"ignor": "Ignorare",
"use_suggested": "Usa suggerito",
"do_not_share_warning_text" : "Non condividerli con nessun altro, incluso il supporto.\n\nTi ruberanno i soldi!",
- "help": "aiuto"
+ "help": "aiuto",
+ "disable_exchange": "Disabilita scambio"
}
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index c1d0de4e3..2d1c291ce 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -651,5 +651,6 @@
"ignor": "無視",
"use_suggested": "推奨を使用",
"do_not_share_warning_text" : "サポートを含め、これらを他の誰とも共有しないでください。\n\n彼らはあなたのお金を盗みます！",
- "help": "ヘルプ"
+ "help": "ヘルプ",
+ "disable_exchange": "交換を無効にする"
}
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 127aa949e..f24e736cb 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -651,5 +651,6 @@
"ignor": "무시하다",
"use_suggested": "추천 사용",
"do_not_share_warning_text" : "지원을 포함하여 다른 사람과 이러한 정보를 공유하지 마십시오.\n\n그들은 당신의 돈을 훔칠 것입니다!",
- "help": "돕다"
+ "help": "돕다",
+ "disable_exchange": "교환 비활성화"
}
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index fa748b552..5663b0357 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -651,5 +651,6 @@
"ignor": "Negeren",
"use_suggested": "Gebruik aanbevolen",
"do_not_share_warning_text" : "Deel deze met niemand anders, ook niet met support.\n\nZe zullen je geld stelen!",
- "help": "helpen"
+ "help": "helpen",
+ "disable_exchange": "Uitwisseling uitschakelen"
}
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 454fe9717..f2a414ae2 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -651,5 +651,6 @@
"ignor": "Ignorować",
"use_suggested": "Użyj sugerowane",
"do_not_share_warning_text" : "Nie udostępniaj ich nikomu innemu, w tym wsparcia.\n\nUkradną twoje pieniądze!",
- "help": "pomoc"
+ "help": "pomoc",
+ "disable_exchange": "Wyłącz wymianę"
}
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 04a0a3ff2..25318dc2d 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -651,5 +651,6 @@
"ignor": "Ignorar",
"use_suggested": "Uso sugerido",
"do_not_share_warning_text" : "Não os compartilhe com mais ninguém, incluindo suporte.\n\nEles vão roubar seu dinheiro!",
- "help": "ajuda"
+ "help": "ajuda",
+ "disable_exchange": "Desativar troca"
}
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 632b0990c..a907e5765 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -651,5 +651,6 @@
"ignor": "Игнорировать",
"use_suggested": "Использовать предложенный",
"do_not_share_warning_text" : "Не делитесь ими с кем-либо еще, в том числе со службой поддержки.\n\nОни украдут ваши деньги!",
- "help": "помощь"
+ "help": "помощь",
+ "disable_exchange": "Отключить обмен"
}
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 5e0f0d18a..91042e91b 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -650,5 +650,6 @@
"ignor": "Ігнорувати",
"use_suggested": "Використати запропоноване",
"do_not_share_warning_text" : "Не повідомляйте їх нікому, включно зі службою підтримки.\n\nВони вкрадуть ваші гроші!",
- "help": "допомога"
+ "help": "допомога",
+ "disable_exchange": "Вимкнути exchange"
}
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index c46d07d59..958e80d14 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -649,5 +649,6 @@
"ignor": "忽视",
"use_suggested": "使用建议",
"do_not_share_warning_text" : "不要與其他任何人分享這些內容，包括支持。\n\n他們會偷你的錢！",
- "help": "帮助"
+ "help": "帮助",
+ "disable_exchange": "禁用交换"
}
From 0fcd72f82136ba3695da14054a750da3a275ed65 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Wed, 23 Nov 2022 09:05:47 +0200
Subject: [PATCH 29/90] format indent code
---
lib/view_model/settings/settings_view_model.dart | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index 9caacb211..7783cd200 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -208,18 +208,18 @@ abstract class SettingsViewModelBase with Store {
}
String getDisplayPriority(dynamic priority) {
- final _priority = priority as TransactionPriority;
+ final _priority = priority as TransactionPriority;
- if (_wallet.type == WalletType.bitcoin
- || _wallet.type == WalletType.litecoin) {
- final rate = bitcoin!.getFeeRate(_wallet, _priority);
- return bitcoin!.bitcoinTransactionPriorityWithLabel(_priority, rate);
- }
+ if (_wallet.type == WalletType.bitcoin
+ || _wallet.type == WalletType.litecoin) {
+ final rate = bitcoin!.getFeeRate(_wallet, _priority);
+ return bitcoin!.bitcoinTransactionPriorityWithLabel(_priority, rate);
+ }
- return priority.toString();
+ return priority.toString();
}
void onDisplayPrioritySelected(TransactionPriority priority) =>
- _settingsStore.priority[_wallet.type] = priority;
+ _settingsStore.priority[_wallet.type] = priority;
}
From 5462836b8d62227c3d1ec00fdaa4a66f42b6a802 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Wed, 23 Nov 2022 19:06:41 +0200
Subject: [PATCH 30/90] seperate settings view model
---
lib/di.dart | 32 +++++-
lib/entities/priority_for_wallet_type.dart | 21 ++++
lib/src/screens/send/widgets/send_card.dart | 3 +-
.../settings/display_settings_page.dart | 4 +-
.../screens/settings/other_settings_page.dart | 6 +-
lib/src/screens/settings/privacy_page.dart | 4 +-
.../settings/security_backup_page.dart | 3 +-
lib/view_model/send/send_view_model.dart | 2 +-
.../settings/display_settings_view_model.dart | 63 +++++++++++
.../settings/other_settings_view_model.dart | 72 +++++++++++++
.../settings/privacy_settings_view_model.dart | 21 ++++
.../security_settings_view_model.dart | 29 +++++
.../settings/settings_view_model.dart | 101 +-----------------
13 files changed, 248 insertions(+), 113 deletions(-)
create mode 100644 lib/entities/priority_for_wallet_type.dart
create mode 100644 lib/view_model/settings/display_settings_view_model.dart
create mode 100644 lib/view_model/settings/other_settings_view_model.dart
create mode 100644 lib/view_model/settings/privacy_settings_view_model.dart
create mode 100644 lib/view_model/settings/security_settings_view_model.dart
diff --git a/lib/di.dart b/lib/di.dart
index 815a3740e..2edb9057e 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -31,6 +31,10 @@ import 'package:cake_wallet/src/screens/dashboard/widgets/balance_page.dart';
import 'package:cake_wallet/view_model/ionia/ionia_account_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_gift_cards_list_view_model.dart';
import 'package:cake_wallet/view_model/ionia/ionia_purchase_merch_view_model.dart';
+import 'package:cake_wallet/view_model/settings/display_settings_view_model.dart';
+import 'package:cake_wallet/view_model/settings/other_settings_view_model.dart';
+import 'package:cake_wallet/view_model/settings/privacy_settings_view_model.dart';
+import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
import 'package:cw_core/unspent_coins_info.dart';
import 'package:cake_wallet/core/backup_service.dart';
import 'package:cw_core/wallet_service.dart';
@@ -443,6 +447,26 @@ Future setup(
return SettingsViewModel(appStore.settingsStore, yatStore, appStore.wallet!);
});
+ getIt.registerFactory(() {
+ final appStore = getIt.get<AppStore>();
+ return DisplaySettingsViewModel(appStore.settingsStore);
+ });
+
+ getIt.registerFactory(() {
+ final appStore = getIt.get<AppStore>();
+ return PrivacySettingsViewModel(appStore.settingsStore);
+ });
+
+ getIt.registerFactory(() {
+ final appStore = getIt.get<AppStore>();
+ return OtherSettingsViewModel(appStore.settingsStore, appStore.wallet!);
+ });
+
+ getIt.registerFactory(() {
+ final appStore = getIt.get<AppStore>();
+ return SecuritySettingsViewModel(appStore.settingsStore);
+ });
+
getIt
.registerFactory(() => WalletSeedViewModel(getIt.get<AppStore>().wallet!));
@@ -481,13 +505,13 @@ Future setup(
getIt.registerFactory(() => ConnectionSyncPage(getIt.get<NodeListViewModel>(), getIt.get<DashboardViewModel>()));
- getIt.registerFactory(() => SecurityBackupPage(getIt.get<SettingsViewModel>()));
+ getIt.registerFactory(() => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>()));
- getIt.registerFactory(() => PrivacyPage(getIt.get<SettingsViewModel>()));
+ getIt.registerFactory(() => PrivacyPage(getIt.get<PrivacySettingsViewModel>()));
- getIt.registerFactory(() => DisplaySettingsPage(getIt.get<SettingsViewModel>()));
+ getIt.registerFactory(() => DisplaySettingsPage(getIt.get<DisplaySettingsViewModel>()));
- getIt.registerFactory(() => OtherSettingsPage(getIt.get<SettingsViewModel>()));
+ getIt.registerFactory(() => OtherSettingsPage(getIt.get<OtherSettingsViewModel>()));
getIt.registerFactory(() =>
NodeCreateOrEditViewModel(_nodeSource, getIt.get<AppStore>().wallet!));
diff --git a/lib/entities/priority_for_wallet_type.dart b/lib/entities/priority_for_wallet_type.dart
new file mode 100644
index 000000000..927ab8803
--- /dev/null
+++ b/lib/entities/priority_for_wallet_type.dart
@@ -0,0 +1,21 @@
+import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/haven/haven.dart';
+import 'package:cake_wallet/monero/monero.dart';
+import 'package:cw_core/transaction_priority.dart';
+import 'package:cw_core/wallet_type.dart';
+
+List<TransactionPriority> priorityForWalletType(WalletType type) {
+ switch (type) {
+ case WalletType.monero:
+ return monero!.getTransactionPriorities();
+ case WalletType.bitcoin:
+ return bitcoin!.getTransactionPriorities();
+ case WalletType.litecoin:
+ return bitcoin!.getLitecoinTransactionPriorities();
+ case WalletType.haven:
+ return haven!.getTransactionPriorities();
+ default:
+ return [];
+ }
+}
+
diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart
index dc589923f..d5775e2b5 100644
--- a/lib/src/screens/send/widgets/send_card.dart
+++ b/lib/src/screens/send/widgets/send_card.dart
@@ -1,11 +1,10 @@
-import 'dart:ui';
+import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
import 'package:cake_wallet/utils/payment_request.dart';
import 'package:cw_core/transaction_priority.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
import 'package:cake_wallet/src/widgets/picker.dart';
import 'package:cake_wallet/view_model/send/output.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
diff --git a/lib/src/screens/settings/display_settings_page.dart b/lib/src/screens/settings/display_settings_page.dart
index 0c18ce09a..fd26da1c4 100644
--- a/lib/src/screens/settings/display_settings_page.dart
+++ b/lib/src/screens/settings/display_settings_page.dart
@@ -8,7 +8,7 @@ import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.
import 'package:cake_wallet/themes/theme_base.dart';
import 'package:cake_wallet/themes/theme_list.dart';
import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
+import 'package:cake_wallet/view_model/settings/display_settings_view_model.dart';
import 'package:cake_wallet/wallet_type_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -19,7 +19,7 @@ class DisplaySettingsPage extends BasePage {
@override
String get title => S.current.display_settings;
- final SettingsViewModel settingsViewModel;
+ final DisplaySettingsViewModel settingsViewModel;
@override
Widget body(BuildContext context) {
diff --git a/lib/src/screens/settings/other_settings_page.dart b/lib/src/screens/settings/other_settings_page.dart
index 65d976708..01bd861b1 100644
--- a/lib/src/screens/settings/other_settings_page.dart
+++ b/lib/src/screens/settings/other_settings_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
@@ -5,8 +6,7 @@ import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arro
import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
import 'package:cake_wallet/src/screens/settings/widgets/settings_version_cell.dart';
import 'package:cake_wallet/src/widgets/standard_list.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
-import 'package:cw_core/transaction_priority.dart';
+import 'package:cake_wallet/view_model/settings/other_settings_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -16,7 +16,7 @@ class OtherSettingsPage extends BasePage {
@override
String get title => S.current.other_settings;
- final SettingsViewModel _settingsViewModel;
+ final OtherSettingsViewModel _settingsViewModel;
@override
Widget body(BuildContext context) {
diff --git a/lib/src/screens/settings/privacy_page.dart b/lib/src/screens/settings/privacy_page.dart
index d8518ce3b..08ab945cc 100644
--- a/lib/src/screens/settings/privacy_page.dart
+++ b/lib/src/screens/settings/privacy_page.dart
@@ -1,7 +1,7 @@
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_switcher_cell.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.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';
@@ -11,7 +11,7 @@ class PrivacyPage extends BasePage {
@override
String get title => S.current.privacy_settings;
- final SettingsViewModel settingsViewModel;
+ final PrivacySettingsViewModel settingsViewModel;
@override
Widget body(BuildContext context) {
diff --git a/lib/src/screens/settings/security_backup_page.dart b/lib/src/screens/settings/security_backup_page.dart
index d950597f0..633450313 100644
--- a/lib/src/screens/settings/security_backup_page.dart
+++ b/lib/src/screens/settings/security_backup_page.dart
@@ -6,6 +6,7 @@ import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -16,7 +17,7 @@ class SecurityBackupPage extends BasePage {
@override
String get title => S.current.security_and_backup;
- final SettingsViewModel settingsViewModel;
+ final SecuritySettingsViewModel settingsViewModel;
@override
Widget body(BuildContext context) {
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index cdef6faba..c673c452d 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -1,10 +1,10 @@
import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
import 'package:cake_wallet/entities/transaction_description.dart';
import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
import 'package:cw_core/transaction_priority.dart';
import 'package:cake_wallet/view_model/send/output.dart';
import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
import 'package:cake_wallet/entities/template.dart';
diff --git a/lib/view_model/settings/display_settings_view_model.dart b/lib/view_model/settings/display_settings_view_model.dart
new file mode 100644
index 000000000..3537dfa6e
--- /dev/null
+++ b/lib/view_model/settings/display_settings_view_model.dart
@@ -0,0 +1,63 @@
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:mobx/mobx.dart';
+
+part 'display_settings_view_model.g.dart';
+
+class DisplaySettingsViewModel = DisplaySettingsViewModelBase with _$DisplaySettingsViewModel;
+
+
+abstract class DisplaySettingsViewModelBase with Store {
+ DisplaySettingsViewModelBase(
+ this._settingsStore,
+ );
+
+ final SettingsStore _settingsStore;
+
+ @computed
+ FiatCurrency get fiatCurrency => _settingsStore.fiatCurrency;
+
+ @computed
+ String get languageCode => _settingsStore.languageCode;
+
+
+ @computed
+ BalanceDisplayMode get balanceDisplayMode =>
+ _settingsStore.balanceDisplayMode;
+
+ @computed
+ bool get shouldDisplayBalance => balanceDisplayMode == BalanceDisplayMode.displayableBalance;
+
+ @computed
+ ThemeBase get theme => _settingsStore.currentTheme;
+
+ @action
+ void setBalanceDisplayMode(BalanceDisplayMode value) =>
+ _settingsStore.balanceDisplayMode = value;
+
+ @action
+ void setShouldDisplayBalance(bool value){
+ if (value) {
+ _settingsStore.balanceDisplayMode = BalanceDisplayMode.displayableBalance;
+ } else {
+ _settingsStore.balanceDisplayMode = BalanceDisplayMode.hiddenBalance;
+ }
+ }
+
+ @action
+ void onLanguageSelected (String code) {
+ _settingsStore.languageCode = code;
+ }
+
+ @action
+ void setTheme(ThemeBase newTheme){
+ _settingsStore.currentTheme = newTheme;
+ }
+
+ @action
+ void setFiatCurrency(FiatCurrency value) =>
+ _settingsStore.fiatCurrency = value;
+
+}
\ No newline at end of file
diff --git a/lib/view_model/settings/other_settings_view_model.dart b/lib/view_model/settings/other_settings_view_model.dart
new file mode 100644
index 000000000..b0ba4c9b5
--- /dev/null
+++ b/lib/view_model/settings/other_settings_view_model.dart
@@ -0,0 +1,72 @@
+import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cw_core/balance.dart';
+import 'package:cw_core/transaction_history.dart';
+import 'package:cw_core/transaction_info.dart';
+import 'package:cw_core/transaction_priority.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:mobx/mobx.dart';
+import 'package:package_info/package_info.dart';
+
+part 'other_settings_view_model.g.dart';
+
+class OtherSettingsViewModel = OtherSettingsViewModelBase
+ with _$OtherSettingsViewModel;
+
+
+abstract class OtherSettingsViewModelBase with Store {
+ OtherSettingsViewModelBase(this._settingsStore, WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
+ TransactionInfo>
+ wallet):
+ walletType = wallet.type,
+ _wallet = wallet,
+ currentVersion = ''{
+ PackageInfo.fromPlatform().then(
+ (PackageInfo packageInfo) => currentVersion = packageInfo.version);
+
+ final priority = _settingsStore.priority[wallet.type];
+ final priorities = priorityForWalletType(wallet.type);
+
+ if (!priorities.contains(priority)) {
+ _settingsStore.priority[wallet.type] = priorities.first;
+ }
+
+ }
+
+ final WalletType walletType;
+ final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
+ TransactionInfo> _wallet;
+
+ @observable
+ String currentVersion;
+
+ final SettingsStore _settingsStore;
+
+ @computed
+ TransactionPriority get transactionPriority {
+ final priority = _settingsStore.priority[walletType];
+
+ if (priority == null) {
+ throw Exception('Unexpected type ${walletType.toString()}');
+ }
+
+ return priority;
+ }
+
+ String getDisplayPriority(dynamic priority) {
+ final _priority = priority as TransactionPriority;
+
+ if (_wallet.type == WalletType.bitcoin
+ || _wallet.type == WalletType.litecoin) {
+ final rate = bitcoin!.getFeeRate(_wallet, _priority);
+ return bitcoin!.bitcoinTransactionPriorityWithLabel(_priority, rate);
+ }
+
+ return priority.toString();
+ }
+
+ void onDisplayPrioritySelected(TransactionPriority priority) =>
+ _settingsStore.priority[_wallet.type] = priority;
+}
\ No newline at end of file
diff --git a/lib/view_model/settings/privacy_settings_view_model.dart b/lib/view_model/settings/privacy_settings_view_model.dart
new file mode 100644
index 000000000..2ea816724
--- /dev/null
+++ b/lib/view_model/settings/privacy_settings_view_model.dart
@@ -0,0 +1,21 @@
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:mobx/mobx.dart';
+
+part 'privacy_settings_view_model.g.dart';
+
+class PrivacySettingsViewModel = PrivacySettingsViewModelBase
+ with _$PrivacySettingsViewModel;
+
+abstract class PrivacySettingsViewModelBase with Store {
+ PrivacySettingsViewModelBase(this._settingsStore);
+
+ final SettingsStore _settingsStore;
+
+ @computed
+ bool get shouldSaveRecipientAddress =>
+ _settingsStore.shouldSaveRecipientAddress;
+
+ @action
+ void setShouldSaveRecipientAddress(bool value) =>
+ _settingsStore.shouldSaveRecipientAddress = value;
+}
\ No newline at end of file
diff --git a/lib/view_model/settings/security_settings_view_model.dart b/lib/view_model/settings/security_settings_view_model.dart
new file mode 100644
index 000000000..9bf2fb6eb
--- /dev/null
+++ b/lib/view_model/settings/security_settings_view_model.dart
@@ -0,0 +1,29 @@
+import 'package:cake_wallet/entities/biometric_auth.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:mobx/mobx.dart';
+
+part 'security_settings_view_model.g.dart';
+
+class SecuritySettingsViewModel = SecuritySettingsViewModelBase
+ with _$SecuritySettingsViewModel;
+
+abstract class SecuritySettingsViewModelBase with Store {
+ SecuritySettingsViewModelBase(this._settingsStore): _biometricAuth = BiometricAuth();
+
+ final BiometricAuth _biometricAuth;
+ final SettingsStore _settingsStore;
+
+ @computed
+ bool get allowBiometricalAuthentication =>
+ _settingsStore.allowBiometricalAuthentication;
+
+ @action
+ Future<bool> biometricAuthenticated()async{
+ return await _biometricAuth.canCheckBiometrics() && await _biometricAuth.isAuthenticated();
+ }
+
+ @action
+ void setAllowBiometricalAuthentication(bool value) =>
+ _settingsStore.allowBiometricalAuthentication = value;
+
+}
\ No newline at end of file
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index 7783cd200..1f34d5374 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -1,6 +1,6 @@
+import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
import 'package:cake_wallet/store/yat/yat_store.dart';
import 'package:mobx/mobx.dart';
-import 'package:package_info/package_info.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:cake_wallet/entities/biometric_auth.dart';
@@ -22,21 +22,6 @@ part 'settings_view_model.g.dart';
class SettingsViewModel = SettingsViewModelBase with _$SettingsViewModel;
-List<TransactionPriority> priorityForWalletType(WalletType type) {
- switch (type) {
- case WalletType.monero:
- return monero!.getTransactionPriorities();
- case WalletType.bitcoin:
- return bitcoin!.getTransactionPriorities();
- case WalletType.litecoin:
- return bitcoin!.getLitecoinTransactionPriorities();
- case WalletType.haven:
- return haven!.getTransactionPriorities();
- default:
- return [];
- }
-}
-
abstract class SettingsViewModelBase with Store {
SettingsViewModelBase(
this._settingsStore,
@@ -46,12 +31,8 @@ abstract class SettingsViewModelBase with Store {
wallet)
: itemHeaders = {},
walletType = wallet.type,
- _wallet = wallet,
- _biometricAuth = BiometricAuth(),
- currentVersion = '' {
- PackageInfo.fromPlatform().then(
- (PackageInfo packageInfo) => currentVersion = packageInfo.version);
-
+ _wallet = wallet{
+
final priority = _settingsStore.priority[wallet.type];
final priorities = priorityForWalletType(wallet.type);
@@ -85,18 +66,9 @@ abstract class SettingsViewModelBase with Store {
}
- @observable
- String currentVersion;
-
- @computed
- Node get node => _settingsStore.getCurrentNode(walletType);
-
@computed
FiatCurrency get fiatCurrency => _settingsStore.fiatCurrency;
- @computed
- String get languageCode => _settingsStore.languageCode;
-
@computed
ObservableList<ActionListDisplayMode> get actionlistDisplayMode =>
_settingsStore.actionlistDisplayMode;
@@ -112,21 +84,6 @@ abstract class SettingsViewModelBase with Store {
return priority;
}
- @computed
- BalanceDisplayMode get balanceDisplayMode =>
- _settingsStore.balanceDisplayMode;
-
- @computed
- bool get shouldDisplayBalance => balanceDisplayMode == BalanceDisplayMode.displayableBalance;
-
- @computed
- bool get shouldSaveRecipientAddress =>
- _settingsStore.shouldSaveRecipientAddress;
-
- @computed
- bool get allowBiometricalAuthentication =>
- _settingsStore.allowBiometricalAuthentication;
-
@computed
ThemeBase get theme => _settingsStore.currentTheme;
@@ -136,26 +93,13 @@ abstract class SettingsViewModelBase with Store {
final SettingsStore _settingsStore;
final YatStore _yatStore;
final WalletType walletType;
- final BiometricAuth _biometricAuth;
final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
TransactionInfo> _wallet;
- @action
- void setBalanceDisplayMode(BalanceDisplayMode value) =>
- _settingsStore.balanceDisplayMode = value;
-
@action
void setFiatCurrency(FiatCurrency value) =>
_settingsStore.fiatCurrency = value;
- @action
- void setShouldSaveRecipientAddress(bool value) =>
- _settingsStore.shouldSaveRecipientAddress = value;
-
- @action
- void setAllowBiometricalAuthentication(bool value) =>
- _settingsStore.allowBiometricalAuthentication = value;
-
@action
void toggleTransactionsDisplay() =>
actionlistDisplayMode.contains(ActionListDisplayMode.transactions)
@@ -183,43 +127,4 @@ abstract class SettingsViewModelBase with Store {
@action
void _showTrades() => actionlistDisplayMode.add(ActionListDisplayMode.trades);
- @action
- Future<bool> biometricAuthenticated()async{
- return await _biometricAuth.canCheckBiometrics() && await _biometricAuth.isAuthenticated();
- }
-
- @action
- void onLanguageSelected (String code) {
- _settingsStore.languageCode = code;
- }
-
- @action
- void setTheme(ThemeBase newTheme){
- _settingsStore.currentTheme = newTheme;
- }
-
- @action
- void setShouldDisplayBalance(bool value){
- if (value) {
- _settingsStore.balanceDisplayMode = BalanceDisplayMode.displayableBalance;
- } else {
- _settingsStore.balanceDisplayMode = BalanceDisplayMode.hiddenBalance;
- }
- }
-
- String getDisplayPriority(dynamic priority) {
- final _priority = priority as TransactionPriority;
-
- if (_wallet.type == WalletType.bitcoin
- || _wallet.type == WalletType.litecoin) {
- final rate = bitcoin!.getFeeRate(_wallet, _priority);
- return bitcoin!.bitcoinTransactionPriorityWithLabel(_priority, rate);
- }
-
- return priority.toString();
- }
-
- void onDisplayPrioritySelected(TransactionPriority priority) =>
- _settingsStore.priority[_wallet.type] = priority;
-
}
From 3acbfbae796e16aa5a613a55f19dfe4815277665 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Fri, 25 Nov 2022 22:51:07 +0200
Subject: [PATCH 31/90] Fix issues from code review
---
lib/di.dart | 23 +---
lib/src/screens/send/send_page.dart | 11 +-
.../settings/display_settings_page.dart | 20 +--
.../screens/settings/other_settings_page.dart | 14 +-
lib/src/screens/settings/privacy_page.dart | 25 +++-
.../settings/security_backup_page.dart | 15 +--
.../exchange/exchange_view_model.dart | 25 +++-
lib/view_model/send/send_view_model.dart | 22 +++-
.../settings/privacy_settings_view_model.dart | 7 +
.../settings/settings_view_model.dart | 124 ------------------
10 files changed, 94 insertions(+), 192 deletions(-)
delete mode 100644 lib/view_model/settings/settings_view_model.dart
diff --git a/lib/di.dart b/lib/di.dart
index 2edb9057e..ce2e2a7d8 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -123,7 +123,6 @@ import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_v
import 'package:cake_wallet/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart';
import 'package:cake_wallet/view_model/monero_account_list/monero_account_list_view_model.dart';
import 'package:cake_wallet/view_model/send/send_view_model.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
import 'package:cake_wallet/view_model/wallet_keys_view_model.dart';
import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
import 'package:cake_wallet/view_model/wallet_restore_view_model.dart';
@@ -385,8 +384,7 @@ Future setup(
_transactionDescriptionBox));
getIt.registerFactory(
- () => SendPage(sendViewModel: getIt.get<SendViewModel>(),
- settingsViewModel: getIt.get<SettingsViewModel>()));
+ () => SendPage(sendViewModel: getIt.get<SendViewModel>()));
getIt.registerFactory(() => SendTemplatePage(
sendTemplateViewModel: getIt.get<SendTemplateViewModel>()));
@@ -442,29 +440,19 @@ Future setup(
getIt.get<MoneroAccountEditOrCreateViewModel>(param1: account)));
getIt.registerFactory(() {
- final appStore = getIt.get<AppStore>();
- final yatStore = getIt.get<YatStore>();
- return SettingsViewModel(appStore.settingsStore, yatStore, appStore.wallet!);
+ return DisplaySettingsViewModel(getIt.get<SettingsStore>());
});
getIt.registerFactory(() {
- final appStore = getIt.get<AppStore>();
- return DisplaySettingsViewModel(appStore.settingsStore);
+ return PrivacySettingsViewModel(getIt.get<SettingsStore>());
});
getIt.registerFactory(() {
- final appStore = getIt.get<AppStore>();
- return PrivacySettingsViewModel(appStore.settingsStore);
+ return OtherSettingsViewModel(getIt(), getIt());
});
getIt.registerFactory(() {
- final appStore = getIt.get<AppStore>();
- return OtherSettingsViewModel(appStore.settingsStore, appStore.wallet!);
- });
-
- getIt.registerFactory(() {
- final appStore = getIt.get<AppStore>();
- return SecuritySettingsViewModel(appStore.settingsStore);
+ return SecuritySettingsViewModel(getIt.get<SettingsStore>());
});
getIt
@@ -530,7 +518,6 @@ Future setup(
getIt.get<TradesStore>(),
getIt.get<AppStore>().settingsStore,
getIt.get<SharedPreferences>(),
- getIt.get<SettingsViewModel>(),
));
getIt.registerFactory(() => ExchangeTradeViewModel(
diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
index e0cfff517..b051a3afb 100644
--- a/lib/src/screens/send/send_page.dart
+++ b/lib/src/screens/send/send_page.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
import 'package:cake_wallet/entities/fiat_currency.dart';
import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
import 'package:cake_wallet/src/screens/send/widgets/send_card.dart';
@@ -6,8 +5,6 @@ import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/src/widgets/picker.dart';
import 'package:cake_wallet/src/widgets/template_tile.dart';
import 'package:cake_wallet/view_model/send/output.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
-import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:mobx/mobx.dart';
@@ -28,13 +25,11 @@ import 'package:smooth_page_indicator/smooth_page_indicator.dart';
import 'package:cw_core/crypto_currency.dart';
class SendPage extends BasePage {
- SendPage({required this.sendViewModel,required this.settingsViewModel }) : _formKey = GlobalKey<FormState>(),fiatFromSettings = settingsViewModel.fiatCurrency;
+ SendPage({required this.sendViewModel}) : _formKey = GlobalKey<FormState>();
final SendViewModel sendViewModel;
- final SettingsViewModel settingsViewModel;
final GlobalKey<FormState> _formKey;
final controller = PageController(initialPage: 0);
- final FiatCurrency fiatFromSettings ;
bool _effectsInstalled = false;
@@ -55,7 +50,7 @@ class SendPage extends BasePage {
@override
void onClose(BuildContext context) {
- settingsViewModel.setFiatCurrency(fiatFromSettings);
+ sendViewModel.onClose();
Navigator.of(context).pop();
}
@@ -236,7 +231,7 @@ class SendPage extends BasePage {
if(template.isCurrencySelected){
output.setCryptoAmount(template.amount);
}else{
- settingsViewModel.setFiatCurrency(fiatFromTemplate);
+ sendViewModel.setFiatCurrency(fiatFromTemplate);
output.setFiatAmount(template.amountFiat);
}
output.resetParsedAddress();
diff --git a/lib/src/screens/settings/display_settings_page.dart b/lib/src/screens/settings/display_settings_page.dart
index fd26da1c4..cd413ff45 100644
--- a/lib/src/screens/settings/display_settings_page.dart
+++ b/lib/src/screens/settings/display_settings_page.dart
@@ -14,12 +14,12 @@ import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
class DisplaySettingsPage extends BasePage {
- DisplaySettingsPage(this.settingsViewModel);
+ DisplaySettingsPage(this._displaySettingsViewModel);
@override
String get title => S.current.display_settings;
- final DisplaySettingsViewModel settingsViewModel;
+ final DisplaySettingsViewModel _displaySettingsViewModel;
@override
Widget body(BuildContext context) {
@@ -30,17 +30,17 @@ class DisplaySettingsPage extends BasePage {
children: [
SettingsSwitcherCell(
title: S.current.settings_display_balance,
- value: settingsViewModel.shouldDisplayBalance,
+ value: _displaySettingsViewModel.shouldDisplayBalance,
onValueChange: (_, bool value) {
- settingsViewModel.setShouldDisplayBalance(value);
+ _displaySettingsViewModel.setShouldDisplayBalance(value);
}),
if (!isHaven)
SettingsPickerCell<FiatCurrency>(
title: S.current.settings_currency,
searchHintText: S.current.search_currency,
items: FiatCurrency.all,
- selectedItem: settingsViewModel.fiatCurrency,
- onItemSelected: (FiatCurrency currency) => settingsViewModel.setFiatCurrency(currency),
+ selectedItem: _displaySettingsViewModel.fiatCurrency,
+ onItemSelected: (FiatCurrency currency) => _displaySettingsViewModel.setFiatCurrency(currency),
images: FiatCurrency.all.map((e) => Image.asset("assets/images/flags/${e.countryCode}.png")).toList(),
isGridView: true,
matchingCriteria: (FiatCurrency currency, String searchText) {
@@ -55,8 +55,8 @@ class DisplaySettingsPage extends BasePage {
displayItem: (dynamic code) {
return LanguageService.list[code] ?? '';
},
- selectedItem: settingsViewModel.languageCode,
- onItemSelected: settingsViewModel.onLanguageSelected,
+ selectedItem: _displaySettingsViewModel.languageCode,
+ onItemSelected: _displaySettingsViewModel.onLanguageSelected,
images: LanguageService.list.keys
.map((e) => Image.asset("assets/images/flags/${LanguageService.localeCountryCode[e]}.png"))
.toList(),
@@ -68,8 +68,8 @@ class DisplaySettingsPage extends BasePage {
ChoicesListItem<ThemeBase>(
title: S.current.color_theme,
items: ThemeList.all,
- selectedItem: settingsViewModel.theme,
- onItemSelected: (ThemeBase theme) => settingsViewModel.setTheme(theme),
+ selectedItem: _displaySettingsViewModel.theme,
+ onItemSelected: (ThemeBase theme) => _displaySettingsViewModel.setTheme(theme),
),
),
],
diff --git a/lib/src/screens/settings/other_settings_page.dart b/lib/src/screens/settings/other_settings_page.dart
index 01bd861b1..e055e2e8e 100644
--- a/lib/src/screens/settings/other_settings_page.dart
+++ b/lib/src/screens/settings/other_settings_page.dart
@@ -11,12 +11,12 @@ import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
class OtherSettingsPage extends BasePage {
- OtherSettingsPage(this._settingsViewModel);
+ OtherSettingsPage(this._otherSettingsViewModel);
@override
String get title => S.current.other_settings;
- final OtherSettingsViewModel _settingsViewModel;
+ final OtherSettingsViewModel _otherSettingsViewModel;
@override
Widget body(BuildContext context) {
@@ -26,10 +26,10 @@ class OtherSettingsPage extends BasePage {
child: Column(children: [
SettingsPickerCell(
title: S.current.settings_fee_priority,
- items: priorityForWalletType(_settingsViewModel.walletType),
- displayItem: _settingsViewModel.getDisplayPriority,
- selectedItem: _settingsViewModel.transactionPriority,
- onItemSelected: _settingsViewModel.onDisplayPrioritySelected,
+ items: priorityForWalletType(_otherSettingsViewModel.walletType),
+ displayItem: _otherSettingsViewModel.getDisplayPriority,
+ selectedItem: _otherSettingsViewModel.transactionPriority,
+ onItemSelected: _otherSettingsViewModel.onDisplayPrioritySelected,
),
SettingsCellWithArrow(
title: S.current.settings_terms_and_conditions,
@@ -37,7 +37,7 @@ class OtherSettingsPage extends BasePage {
),
StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
Spacer(),
- SettingsVersionCell(title: S.of(context).version(_settingsViewModel.currentVersion))
+ SettingsVersionCell(title: S.of(context).version(_otherSettingsViewModel.currentVersion))
]),
);
});
diff --git a/lib/src/screens/settings/privacy_page.dart b/lib/src/screens/settings/privacy_page.dart
index 08ab945cc..47041b4fb 100644
--- a/lib/src/screens/settings/privacy_page.dart
+++ b/lib/src/screens/settings/privacy_page.dart
@@ -6,24 +6,37 @@ import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
class PrivacyPage extends BasePage {
- PrivacyPage(this.settingsViewModel);
+ PrivacyPage(this._privacySettingsViewModel);
@override
String get title => S.current.privacy_settings;
- final PrivacySettingsViewModel settingsViewModel;
+ final PrivacySettingsViewModel _privacySettingsViewModel;
@override
Widget body(BuildContext context) {
return Container(
padding: EdgeInsets.only(top: 10),
child: Observer(builder: (_) {
- return SettingsSwitcherCell(
+ return Observer(builder: (_) {
+ return Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ SettingsSwitcherCell(
+ title: S.current.disable_exchange,
+ value: _privacySettingsViewModel.disableExchange,
+ onValueChange: (BuildContext context, bool value) {
+ _privacySettingsViewModel.setEnableExchange(value);
+ }),
+ SettingsSwitcherCell(
title: S.current.settings_save_recipient_address,
- value: settingsViewModel.shouldSaveRecipientAddress,
+ value: _privacySettingsViewModel.shouldSaveRecipientAddress,
onValueChange: (BuildContext _, bool value) {
- settingsViewModel.setShouldSaveRecipientAddress(value);
- });
+ _privacySettingsViewModel.setShouldSaveRecipientAddress(value);
+ })
+ ],
+ );
+ });
}),
);
}
diff --git a/lib/src/screens/settings/security_backup_page.dart b/lib/src/screens/settings/security_backup_page.dart
index 633450313..224c941ee 100644
--- a/lib/src/screens/settings/security_backup_page.dart
+++ b/lib/src/screens/settings/security_backup_page.dart
@@ -7,17 +7,16 @@ import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arro
import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
import 'package:cake_wallet/src/widgets/standard_list.dart';
import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
class SecurityBackupPage extends BasePage {
- SecurityBackupPage(this.settingsViewModel);
+ SecurityBackupPage(this._securitySettingsViewModel);
@override
String get title => S.current.security_and_backup;
- final SecuritySettingsViewModel settingsViewModel;
+ final SecuritySettingsViewModel _securitySettingsViewModel;
@override
Widget body(BuildContext context) {
@@ -59,23 +58,23 @@ class SecurityBackupPage extends BasePage {
Observer(builder: (_) {
return SettingsSwitcherCell(
title: S.current.settings_allow_biometrical_authentication,
- value: settingsViewModel.allowBiometricalAuthentication,
+ value: _securitySettingsViewModel.allowBiometricalAuthentication,
onValueChange: (BuildContext context, bool value) {
if (value) {
Navigator.of(context).pushNamed(Routes.auth,
arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
if (isAuthenticatedSuccessfully) {
- if (await settingsViewModel.biometricAuthenticated()) {
- settingsViewModel.setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
+ if (await _securitySettingsViewModel.biometricAuthenticated()) {
+ _securitySettingsViewModel.setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
}
} else {
- settingsViewModel.setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
+ _securitySettingsViewModel.setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
}
auth.close();
});
} else {
- settingsViewModel.setAllowBiometricalAuthentication(value);
+ _securitySettingsViewModel.setAllowBiometricalAuthentication(value);
}
});
}),
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 725208324..68947d170 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -6,8 +6,8 @@ import 'package:cake_wallet/entities/preferences_key.dart';
import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart';
import 'package:cake_wallet/exchange/sideshift/sideshift_request.dart';
import 'package:cake_wallet/exchange/simpleswap/simpleswap_exchange_provider.dart';
-import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
import 'package:cake_wallet/exchange/simpleswap/simpleswap_request.dart';
+import 'package:cw_core/transaction_priority.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/crypto_currency.dart';
import 'package:cw_core/sync_status.dart';
@@ -42,7 +42,7 @@ class ExchangeViewModel = ExchangeViewModelBase with _$ExchangeViewModel;
abstract class ExchangeViewModelBase with Store {
ExchangeViewModelBase(this.wallet, this.trades, this._exchangeTemplateStore,
- this.tradesStore, this._settingsStore, this.sharedPreferences, this._settingsViewModel)
+ this.tradesStore, this._settingsStore, this.sharedPreferences)
: _cryptoNumberFormat = NumberFormat(),
isReverse = false,
isFixedRateMode = false,
@@ -189,6 +189,19 @@ abstract class ExchangeViewModelBase with Store {
ObservableList<ExchangeTemplate> get templates =>
_exchangeTemplateStore.templates;
+
+ @computed
+ TransactionPriority get transactionPriority {
+ final priority = _settingsStore.priority[wallet.type];
+
+ if (priority == null) {
+ throw Exception('Unexpected type ${wallet.type.toString()}');
+ }
+
+ return priority;
+ }
+
+
bool get hasAllAmount =>
wallet.type == WalletType.bitcoin && depositCurrency == wallet.currency;
@@ -198,11 +211,11 @@ abstract class ExchangeViewModelBase with Store {
switch (wallet.type) {
case WalletType.monero:
case WalletType.haven:
- return _settingsViewModel.transactionPriority == monero!.getMoneroTransactionPrioritySlow();
+ return transactionPriority == monero!.getMoneroTransactionPrioritySlow();
case WalletType.bitcoin:
- return _settingsViewModel.transactionPriority == bitcoin!.getBitcoinTransactionPrioritySlow();
+ return transactionPriority == bitcoin!.getBitcoinTransactionPrioritySlow();
case WalletType.litecoin:
- return _settingsViewModel.transactionPriority == bitcoin!.getLitecoinTransactionPrioritySlow();
+ return transactionPriority == bitcoin!.getLitecoinTransactionPrioritySlow();
default:
return false;
}
@@ -220,8 +233,6 @@ abstract class ExchangeViewModelBase with Store {
final SettingsStore _settingsStore;
- final SettingsViewModel _settingsViewModel;
-
double _bestRate = 0.0;
late Timer bestRateSync;
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index c673c452d..25a5cc7ee 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -42,7 +42,8 @@ abstract class SendViewModelBase with Store {
: state = InitialExecutionState(),
currencies = _wallet.balance.keys.toList(),
selectedCryptoCurrency = _wallet.currency,
- outputs = ObservableList<Output>() {
+ outputs = ObservableList<Output>(),
+ fiatFromSettings = _settingsStore.fiatCurrency {
final priority = _settingsStore.priority[_wallet.type];
final priorities = priorityForWalletType(_wallet.type);
@@ -52,7 +53,7 @@ abstract class SendViewModelBase with Store {
outputs.add(Output(_wallet, _settingsStore, _fiatConversationStore, () => selectedCryptoCurrency));
}
-
+
@observable
ExecutionState state;
@@ -133,11 +134,13 @@ abstract class SendViewModelBase with Store {
Validator get textValidator => TextValidator();
+ final FiatCurrency fiatFromSettings;
+
@observable
PendingTransaction? pendingTransaction;
@computed
- String get balance => balanceViewModel.availableBalance ?? '0.0';
+ String get balance => balanceViewModel.availableBalance;
@computed
bool get isReadyForSend => _wallet.syncStatus is SyncedSyncStatus;
@@ -166,6 +169,9 @@ abstract class SendViewModelBase with Store {
bool get hasCurrecyChanger => walletType == WalletType.haven;
+ @computed
+ FiatCurrency get fiatCurrency => _settingsStore.fiatCurrency;
+
final WalletBase _wallet;
final SettingsStore _settingsStore;
final SendTemplateViewModel sendTemplateViewModel;
@@ -208,7 +214,7 @@ abstract class SendViewModelBase with Store {
state = TransactionCommitting();
await pendingTransaction!.commit();
- if (pendingTransaction!.id?.isNotEmpty ?? false) {
+ if (pendingTransaction!.id.isNotEmpty) {
_settingsStore.shouldSaveRecipientAddress
? await transactionDescriptionBox.add(TransactionDescription(
id: pendingTransaction!.id,
@@ -283,4 +289,12 @@ abstract class SendViewModelBase with Store {
bool _isEqualCurrency(String currency) =>
currency.toLowerCase() == _wallet.currency.title.toLowerCase();
+
+ @action
+ void onClose() =>
+ _settingsStore.fiatCurrency = fiatFromSettings;
+
+ @action
+ void setFiatCurrency(FiatCurrency fiat) =>
+ _settingsStore.fiatCurrency = fiat;
}
diff --git a/lib/view_model/settings/privacy_settings_view_model.dart b/lib/view_model/settings/privacy_settings_view_model.dart
index 2ea816724..8433e673a 100644
--- a/lib/view_model/settings/privacy_settings_view_model.dart
+++ b/lib/view_model/settings/privacy_settings_view_model.dart
@@ -11,6 +11,9 @@ abstract class PrivacySettingsViewModelBase with Store {
final SettingsStore _settingsStore;
+ @computed
+ bool get disableExchange => _settingsStore.disableExchange;
+
@computed
bool get shouldSaveRecipientAddress =>
_settingsStore.shouldSaveRecipientAddress;
@@ -18,4 +21,8 @@ abstract class PrivacySettingsViewModelBase with Store {
@action
void setShouldSaveRecipientAddress(bool value) =>
_settingsStore.shouldSaveRecipientAddress = value;
+
+ @action
+ void setEnableExchange(bool value) =>
+ _settingsStore.disableExchange = value;
}
\ No newline at end of file
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
deleted file mode 100644
index d5de8be67..000000000
--- a/lib/view_model/settings/settings_view_model.dart
+++ /dev/null
@@ -1,124 +0,0 @@
-import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
-import 'package:cake_wallet/store/yat/yat_store.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cw_core/wallet_base.dart';
-import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:cake_wallet/entities/fiat_currency.dart';
-import 'package:cake_wallet/entities/action_list_display_mode.dart';
-import 'package:cw_core/transaction_history.dart';
-import 'package:cw_core/balance.dart';
-import 'package:cw_core/transaction_info.dart';
-import 'package:cw_core/transaction_priority.dart';
-import 'package:cake_wallet/themes/theme_base.dart';
-
-part 'settings_view_model.g.dart';
-
-class SettingsViewModel = SettingsViewModelBase with _$SettingsViewModel;
-
-abstract class SettingsViewModelBase with Store {
- SettingsViewModelBase(
- this._settingsStore,
- this._yatStore,
- WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
- TransactionInfo>
- wallet)
- : itemHeaders = {},
- walletType = wallet.type,
- _wallet = wallet{
-
- final priority = _settingsStore.priority[wallet.type];
- final priorities = priorityForWalletType(wallet.type);
-
- if (!priorities.contains(priority)) {
- _settingsStore.priority[wallet.type] = priorities.first;
- }
-
- //var connectYatUrl = YatLink.baseUrl + YatLink.signInSuffix;
- //final connectYatUrlParameters =
- // _yatStore.defineQueryParameters();
-
- //if (connectYatUrlParameters.isNotEmpty) {
- // connectYatUrl += YatLink.queryParameter + connectYatUrlParameters;
- //}
-
- //var manageYatUrl = YatLink.baseUrl + YatLink.managePath;
- //final manageYatUrlParameters =
- // _yatStore.defineQueryParameters();
-
- //if (manageYatUrlParameters.isNotEmpty) {
- // manageYatUrl += YatLink.queryParameter + manageYatUrlParameters;
- //}
-
- //var createNewYatUrl = YatLink.startFlowUrl;
- //final createNewYatUrlParameters =
- // _yatStore.defineQueryParameters();
-
- //if (createNewYatUrlParameters.isNotEmpty) {
- // createNewYatUrl += '?sub1=' + createNewYatUrlParameters;
- //}
-
- }
-
- @computed
- FiatCurrency get fiatCurrency => _settingsStore.fiatCurrency;
-
- @computed
- ObservableList<ActionListDisplayMode> get actionlistDisplayMode =>
- _settingsStore.actionlistDisplayMode;
-
- @computed
- TransactionPriority get transactionPriority {
- final priority = _settingsStore.priority[walletType];
-
- if (priority == null) {
- throw Exception('Unexpected type ${walletType.toString()}');
- }
-
- return priority;
- }
-
- @computed
- ThemeBase get theme => _settingsStore.currentTheme;
-
- bool get isBitcoinBuyEnabled => _settingsStore.isBitcoinBuyEnabled;
-
- final Map<String, String> itemHeaders;
- final SettingsStore _settingsStore;
- final YatStore _yatStore;
- final WalletType walletType;
- final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
- TransactionInfo> _wallet;
-
- @action
- void setFiatCurrency(FiatCurrency value) =>
- _settingsStore.fiatCurrency = value;
-
- @action
- void toggleTransactionsDisplay() =>
- actionlistDisplayMode.contains(ActionListDisplayMode.transactions)
- ? _hideTransaction()
- : _showTransaction();
-
- @action
- void toggleTradesDisplay() =>
- actionlistDisplayMode.contains(ActionListDisplayMode.trades)
- ? _hideTrades()
- : _showTrades();
-
- @action
- void _hideTransaction() =>
- actionlistDisplayMode.remove(ActionListDisplayMode.transactions);
-
- @action
- void _hideTrades() =>
- actionlistDisplayMode.remove(ActionListDisplayMode.trades);
-
- @action
- void _showTransaction() =>
- actionlistDisplayMode.add(ActionListDisplayMode.transactions);
-
- @action
- void _showTrades() => actionlistDisplayMode.add(ActionListDisplayMode.trades);
-
-}
From 08edd4d8fff65ba368317f78109d68fbd94f4c8a Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sat, 26 Nov 2022 02:33:37 +0200
Subject: [PATCH 32/90] Add types for OtherSettingsViewModel dependencies
---
lib/di.dart | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/di.dart b/lib/di.dart
index ce2e2a7d8..6248a2c1a 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -448,7 +448,7 @@ Future setup(
});
getIt.registerFactory(() {
- return OtherSettingsViewModel(getIt(), getIt());
+ return OtherSettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!);
});
getIt.registerFactory(() {
From 0188089bd8d3656ea262200681dfbc404fee6851 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sat, 26 Nov 2022 14:07:01 +0200
Subject: [PATCH 33/90] Remove unused nodes list page route
---
lib/di.dart | 2 --
lib/router.dart | 4 ----
lib/routes.dart | 1 -
lib/src/screens/nodes/nodes_list_page.dart | 2 ++
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/lib/di.dart b/lib/di.dart
index 6248a2c1a..9245e58ca 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -489,8 +489,6 @@ Future setup(
_nodeSource, appStore.wallet!, appStore.settingsStore);
});
- getIt.registerFactory(() => NodeListPage(getIt.get<NodeListViewModel>()));
-
getIt.registerFactory(() => ConnectionSyncPage(getIt.get<NodeListViewModel>(), getIt.get<DashboardViewModel>()));
getIt.registerFactory(() => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>()));
diff --git a/lib/router.dart b/lib/router.dart
index 7818cc52f..f9aa37a02 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -278,10 +278,6 @@ Route<dynamic> createRoute(RouteSettings settings) {
param2: false),
onWillPop: () async => false));
- case Routes.nodeList:
- return CupertinoPageRoute<void>(
- builder: (_) => getIt.get<NodeListPage>());
-
case Routes.connectionSync:
return CupertinoPageRoute<void>(
builder: (_) => getIt.get<ConnectionSyncPage>());
diff --git a/lib/routes.dart b/lib/routes.dart
index 04642ba34..d738b13e8 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -21,7 +21,6 @@ class Routes {
static const seedLanguage = '/seed_language';
static const walletList = '/view_model.wallet_list';
static const auth = '/auth';
- static const nodeList = '/node_list';
static const newNode = '/new_node_list';
static const login = '/login';
static const splash = '/splash';
diff --git a/lib/src/screens/nodes/nodes_list_page.dart b/lib/src/screens/nodes/nodes_list_page.dart
index 556a0fd06..4e72c511e 100644
--- a/lib/src/screens/nodes/nodes_list_page.dart
+++ b/lib/src/screens/nodes/nodes_list_page.dart
@@ -23,6 +23,8 @@ class NodeListPage extends BasePage {
@override
Widget trailing(context) {
+ // TODO: check if this will be used in the new design and then delete the whole page
+ // as it's not used anymore
return Container(
height: 32,
decoration: BoxDecoration(
From 79fb1b91d4b661cba9e1e668f59c9fcf152dc76b Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sat, 26 Nov 2022 16:13:54 +0200
Subject: [PATCH 34/90] Check for Nodes if exists before adding them in nodes
Fix nullability issue due to early access Fix Nodes_list,yml file structure
---
assets/node_list.yml | 4 ++--
lib/entities/default_settings_migration.dart | 22 +++++++++++++++----
.../on_authentication_state_change.dart | 4 ++--
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/assets/node_list.yml b/assets/node_list.yml
index 09fb72383..7962ea18c 100644
--- a/assets/node_list.yml
+++ b/assets/node_list.yml
@@ -22,10 +22,10 @@
-
uri: node.imonero.org:18081
is_default: false
-
+-
uri: node.c3pool.com:18081
is_default: false
-
+-
uri: xmr.prprpr.icu:18081
is_default: false
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index b2036c3f6..fb404cd88 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -69,6 +69,8 @@ Future defaultSettingsMigration(
sharedPreferences: sharedPreferences, nodes: nodes);
await changeLitecoinCurrentElectrumServerToDefault(
sharedPreferences: sharedPreferences, nodes: nodes);
+ await changeHavenCurrentNodeToDefault(
+ sharedPreferences: sharedPreferences, nodes: nodes);
break;
case 2:
@@ -277,17 +279,29 @@ Future<void> updateNodeTypes({required Box<Node> nodes}) async {
Future<void> addBitcoinElectrumServerList({required Box<Node> nodes}) async {
final serverList = await loadBitcoinElectrumServerList();
- await nodes.addAll(serverList);
+ for (var node in serverList) {
+ if (nodes.values.firstWhereOrNull((element) => element.uriRaw == node.uriRaw) == null) {
+ await nodes.add(node);
+ }
+ }
}
Future<void> addLitecoinElectrumServerList({required Box<Node> nodes}) async {
final serverList = await loadLitecoinElectrumServerList();
- await nodes.addAll(serverList);
+ for (var node in serverList) {
+ if (nodes.values.firstWhereOrNull((element) => element.uriRaw == node.uriRaw) == null) {
+ await nodes.add(node);
+ }
+ }
}
Future<void> addHavenNodeList({required Box<Node> nodes}) async {
final nodeList = await loadDefaultHavenNodes();
- await nodes.addAll(nodeList);
+ for (var node in nodeList) {
+ if (nodes.values.firstWhereOrNull((element) => element.uriRaw == node.uriRaw) == null) {
+ await nodes.add(node);
+ }
+ }
}
Future<void> addAddressesForMoneroWallets(
@@ -431,7 +445,7 @@ Future<void> resetBitcoinElectrumServer(
final oldElectrumServer = nodeSource.values.firstWhereOrNull(
(node) => node.uri.toString().contains('electrumx.cakewallet.com'));
var cakeWalletNode = nodeSource.values.firstWhereOrNull(
- (node) => node.uri.toString() == cakeWalletBitcoinElectrumUri);
+ (node) => node.uriRaw.toString() == cakeWalletBitcoinElectrumUri);
if (cakeWalletNode == null) {
cakeWalletNode =
diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
index c91f5277e..560326cb5 100644
--- a/lib/reactions/on_authentication_state_change.dart
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -23,12 +23,12 @@ void startAuthenticationStateChange(AuthenticationStore authenticationStore,
}
if (state == AuthenticationState.allowed) {
- await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
+ await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
return;
}
if (state == AuthenticationState.denied) {
- await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
+ await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
return;
}
});
From 4d91ef6af8b554f66f68239b8fde46a7be59d7f2 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Sun, 27 Nov 2022 22:10:21 +0200
Subject: [PATCH 35/90] App Center Integration with CI/CD workflow (#644)
Add Ionia client id to secrets
Update how to build android instructions
Change devicelocale version as it caused issues when building
Add trigger for send test build to transfer.sh and notify slack channel
---
.github/workflows/pr_test_build.yml | 116 ++++++++++++++++++++++++++++
howto-build-android.md | 8 +-
pubspec_base.yaml | 2 +-
tool/utils/secret_key.dart | 1 +
4 files changed, 124 insertions(+), 3 deletions(-)
create mode 100644 .github/workflows/pr_test_build.yml
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
new file mode 100644
index 000000000..dd2f1edeb
--- /dev/null
+++ b/.github/workflows/pr_test_build.yml
@@ -0,0 +1,116 @@
+name: PR Test Build
+
+on:
+ pull_request:
+ branches: [ main ]
+
+jobs:
+ test:
+
+ runs-on: ubuntu-18.04
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: '8.x'
+
+ - name: Flutter action
+ uses: subosito/flutter-action@v1
+ with:
+ flutter-version: '3.3.x'
+ channel: stable
+
+ - name: Install package dependencies
+ run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
+
+ - name: Execute Build and Setup Commands
+ run: |
+ sudo mkdir -p /opt/android
+ sudo chown $USER /opt/android
+ cd /opt/android
+ git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
+ cd cake_wallet/scripts/android/
+ ./install_ndk.sh
+ source ./app_env.sh cakewallet
+ ./app_config.sh
+ ./build_all.sh
+ ./copy_monero_deps.sh
+
+ - name: Install Flutter dependencies
+ run: |
+ cd /opt/android/cake_wallet
+ flutter pub get
+
+ - name: Generate KeyStore
+ run: |
+ cd /opt/android/cake_wallet/android/app
+ keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass ${{ secrets.STORE_PASS }} -keypass ${{ secrets.KEY_PASS }}
+
+ - name: Generate key properties
+ run: |
+ cd /opt/android/cake_wallet
+ flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=${{ secrets.STORE_PASS }} keyPassword=${{ secrets.KEY_PASS }}
+
+ - name: Generate localization
+ run: |
+ cd /opt/android/cake_wallet
+ flutter packages pub run tool/generate_localization.dart
+
+ - name: Build generated code
+ run: |
+ cd /opt/android/cake_wallet
+ cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ flutter packages pub run build_runner build --delete-conflicting-outputs
+
+ - name: Add secrets
+ run: |
+ cd /opt/android/cake_wallet
+ touch lib/.secrets.g.dart
+ echo "const salt = '${{ secrets.SALT }}';" > lib/.secrets.g.dart
+ echo "const keychainSalt = '${{ secrets.KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+ echo "const key = '${{ secrets.KEY }}';" >> lib/.secrets.g.dart
+ echo "const walletSalt = '${{ secrets.WALLET_SALT }}';" >> lib/.secrets.g.dart
+ echo "const shortKey = '${{ secrets.SHORT_KEY }}';" >> lib/.secrets.g.dart
+ echo "const backupSalt = '${{ secrets.BACKUP_SALT }}';" >> lib/.secrets.g.dart
+ echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+ echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
+ echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
+ echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart
+ echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart
+ echo "const sideShiftApiKey = '${{ secrets.SIDE_SHIFT_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
+ echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
+
+ - name: Build
+ run: |
+ cd /opt/android/cake_wallet
+ flutter build apk --release
+
+# - name: Push to App Center
+# run: |
+# echo 'Installing App Center CLI tools'
+# npm install -g appcenter-cli
+# echo "Publishing test to App Center"
+# appcenter distribute release \
+# --group "Testers" \
+# --file "/opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk" \
+# --release-notes ${GITHUB_HEAD_REF} \
+# --app Cake-Labs/Cake-Wallet \
+# --token ${{ secrets.APP_CENTER_TOKEN }} \
+# --quiet
+
+ - name: Send Test APK
+ run: |
+ cd /opt/android/cake_wallet
+ var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/app-release.apk)
+ curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
+
diff --git a/howto-build-android.md b/howto-build-android.md
index 28478cdd1..4ef385b9f 100644
--- a/howto-build-android.md
+++ b/howto-build-android.md
@@ -55,7 +55,7 @@ You may download and install the latest version of Android Studio [here](https:/
### 3. Installing Flutter
-Need to install flutter with version `2.0.4`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually). When flutter repository is downloaded please open it with `cd <flutter-path>` and checkout version 2.0.4 by `git checkout 2.0.4`.
+Need to install flutter with version `3.x.x`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually).
### 4. Verify Installations
@@ -66,7 +66,7 @@ Verify that the Android toolchain, Flutter, and Android Studio have been correct
The output of this command will appear like this, indicating successful installations. If there are problems with your installation, they **must** be corrected before proceeding.
```
Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 2.0.4, on Linux, locale en_US.UTF-8)
+[✓] Flutter (Channel stable, 3.x.x, on Linux, locale en_US.UTF-8)
[✓] Android toolchain - develop for Android devices (Android SDK version 28)
[✓] Android Studio (version 4.0)
```
@@ -156,6 +156,10 @@ Generate mobx models for `cw_bitcoin`:
`cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..`
+Generate mobx models for `cw_haven`:
+
+`cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..`
+
Finally build mobx models for the app:
`$ flutter packages pub run build_runner build --delete-conflicting-outputs`
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index 248a06de0..00e1a39b1 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -34,7 +34,7 @@ dependencies:
local_auth: ^2.1.0
package_info: ^2.0.0
#package_info_plus: ^1.4.2
- devicelocale: ^0.5.4
+ devicelocale: ^0.4.3
auto_size_text: ^3.0.0
dotted_border: ^2.0.0+2
smooth_page_indicator: ^1.0.0+2
diff --git a/tool/utils/secret_key.dart b/tool/utils/secret_key.dart
index 64c7beefd..e5202a829 100644
--- a/tool/utils/secret_key.dart
+++ b/tool/utils/secret_key.dart
@@ -28,6 +28,7 @@ class SecretKey {
SecretKey('simpleSwapApiKey', () => ''),
SecretKey('anypayToken', () => ''),
SecretKey('onramperApiKey', () => ''),
+ SecretKey('ioniaClientId', () => ''),
];
final String name;
From a51384bd067fb4ab17aa469782f38fc044ad00af Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Mon, 28 Nov 2022 14:04:03 +0200
Subject: [PATCH 36/90] Remove unused nodes_list_page.dart
---
lib/di.dart | 1 -
lib/router.dart | 1 -
lib/src/screens/nodes/nodes_list_page.dart | 168 ---------------------
3 files changed, 170 deletions(-)
delete mode 100644 lib/src/screens/nodes/nodes_list_page.dart
diff --git a/lib/di.dart b/lib/di.dart
index 9245e58ca..c62dc9790 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -58,7 +58,6 @@ import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart'
import 'package:cake_wallet/src/screens/faq/faq_page.dart';
import 'package:cake_wallet/src/screens/new_wallet/new_wallet_type_page.dart';
import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
-import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
import 'package:cake_wallet/src/screens/order_details/order_details_page.dart';
import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
import 'package:cake_wallet/src/screens/rescan/rescan_page.dart';
diff --git a/lib/router.dart b/lib/router.dart
index f9aa37a02..4d3d61f5f 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -41,7 +41,6 @@ import 'package:cake_wallet/src/screens/dashboard/dashboard_page.dart';
import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
import 'package:cake_wallet/src/screens/auth/auth_page.dart';
import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
-import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
import 'package:cake_wallet/src/screens/receive/receive_page.dart';
import 'package:cake_wallet/src/screens/subaddress/address_edit_or_create_page.dart';
import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
diff --git a/lib/src/screens/nodes/nodes_list_page.dart b/lib/src/screens/nodes/nodes_list_page.dart
deleted file mode 100644
index 4e72c511e..000000000
--- a/lib/src/screens/nodes/nodes_list_page.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cw_core/node.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/palette.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/nodes/widgets/node_list_row.dart';
-import 'package:cake_wallet/src/widgets/standard_list.dart';
-import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
-import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart';
-import 'package:flutter_slidable/flutter_slidable.dart';
-
-class NodeListPage extends BasePage {
- NodeListPage(this.nodeListViewModel);
-
- @override
- String get title => S.current.nodes;
-
- final NodeListViewModel nodeListViewModel;
-
- @override
- Widget trailing(context) {
- // TODO: check if this will be used in the new design and then delete the whole page
- // as it's not used anymore
- return Container(
- height: 32,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.all(Radius.circular(16)),
- color: Theme.of(context).accentTextTheme.caption!.color!),
- child: ButtonTheme(
- minWidth: double.minPositive,
- child: TextButton(
- onPressed: () async {
- await showPopUp<void>(
- context: context,
- builder: (BuildContext context) {
- return AlertWithTwoActions(
- alertTitle: S.of(context).node_reset_settings_title,
- alertContent:
- S.of(context).nodes_list_reset_to_default_message,
- rightButtonText: S.of(context).reset,
- leftButtonText: S.of(context).cancel,
- actionRightButton: () async {
- Navigator.of(context).pop();
- await nodeListViewModel.reset();
- },
- actionLeftButton: () => Navigator.of(context).pop());
- });
- },
- child: Text(
- S.of(context).reset,
- textAlign: TextAlign.center,
- style: TextStyle(
- fontSize: 14.0,
- fontWeight: FontWeight.w600,
- color: Palette.blueCraiola),
- )),
- ),
- );
- }
-
- @override
- Widget body(BuildContext context) {
- return Container(
- padding: EdgeInsets.only(top: 10),
- child: Observer(
- builder: (BuildContext context) {
- return SectionStandardList(
- sectionCount: 2,
- context: context,
- itemCounter: (int sectionIndex) {
- if (sectionIndex == 0) {
- return 1;
- }
-
- return nodeListViewModel.nodes.length;
- },
- itemBuilder: (_, sectionIndex, index) {
- if (sectionIndex == 0) {
- return NodeHeaderListRow(
- title: S.of(context).add_new_node,
- onTap: (_) async => await Navigator.of(context)
- .pushNamed(Routes.newNode));
- }
-
- final node = nodeListViewModel.nodes[index];
- final isSelected =
- node.keyIndex == nodeListViewModel.currentNode.keyIndex;
- final nodeListRow = NodeListRow(
- title: node.uriRaw,
- isSelected: isSelected,
- isAlive: node.requestNode(),
- onTap: (_) async {
- if (isSelected) {
- return;
- }
-
- await showPopUp<void>(
- context: context,
- builder: (BuildContext context) {
- return AlertWithTwoActions(
- alertTitle:
- S.of(context).change_current_node_title,
- alertContent: S
- .of(context)
- .change_current_node(node.uriRaw),
- leftButtonText: S.of(context).cancel,
- rightButtonText: S.of(context).change,
- actionLeftButton: () =>
- Navigator.of(context).pop(),
- actionRightButton: () async {
- await nodeListViewModel.setAsCurrent(node);
- Navigator.of(context).pop();
- });
- });
- });
-
- final dismissibleRow = Slidable(
- key: Key('${node.keyIndex}'),
- startActionPane: _actionPane(context, node),
- endActionPane: _actionPane(context, node),
- child: nodeListRow,
- );
-
- return isSelected ? nodeListRow : dismissibleRow;
- });
- },
- ),
- );
- }
-
- ActionPane _actionPane(BuildContext context, Node node) => ActionPane(
- motion: const ScrollMotion(),
- extentRatio: 0.3,
- children: [
- SlidableAction(
- onPressed: (context) async {
- final confirmed = await showPopUp<bool>(
- context: context,
- builder: (BuildContext context) {
- return AlertWithTwoActions(
- alertTitle: S.of(context).remove_node,
- alertContent:
- S.of(context).remove_node_message,
- rightButtonText: S.of(context).remove,
- leftButtonText: S.of(context).cancel,
- actionRightButton: () =>
- Navigator.pop(context, true),
- actionLeftButton: () =>
- Navigator.pop(context, false));
- }) ??
- false;
-
- if (confirmed) {
- await nodeListViewModel.delete(node);
- }
- },
- backgroundColor: Colors.red,
- foregroundColor: Colors.white,
- icon: CupertinoIcons.delete,
- label: S.of(context).delete,
- ),
- ],
- );
-}
From c8a9c1f53f1a60c93e557f7a10462d2f490d298c Mon Sep 17 00:00:00 2001
From: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
Date: Mon, 28 Nov 2022 09:45:18 -0600
Subject: [PATCH 37/90] Update Monero nodes
---
assets/node_list.yml | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/assets/node_list.yml b/assets/node_list.yml
index 7962ea18c..39b440c9f 100644
--- a/assets/node_list.yml
+++ b/assets/node_list.yml
@@ -1,31 +1,21 @@
-
- uri: xmr-node-uk.cakewallet.com:18081
+ uri: xmr-node.cakewallet.com:18081
is_default: true
-
- uri: xmr-node-eu.cakewallet.com:18081
+ uri: node.sethforprivacy.com:18089
is_default: false
-
- uri: xmr-node-usa-east.cakewallet.com:18081
- is_default: false
--
- uri: node.moneroworld.com:18089
- is_default: false
--
- uri: node.xmr.pt:18081
- is_default: false
--
- uri: node.monero.net:18081
- is_default: false
--
- uri: opennode.xmr-tw.org:18089
- is_default: false
--
- uri: node.imonero.org:18081
+ uri: nodes.hashvault.pro:18081
is_default: false
-
uri: node.c3pool.com:18081
is_default: false
-
- uri: xmr.prprpr.icu:18081
+ uri: node.supportxmr.com:18081
+ is_default: false
+-
+ uri: node.community.rino.io:18081
+ is_default: false
+-
+ uri: node.moneroworld.com:18089
is_default: false
-
From 1dd94c96058cdd153a748b9e6cbad430adc0f75f Mon Sep 17 00:00:00 2001
From: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
Date: Mon, 28 Nov 2022 10:11:52 -0600
Subject: [PATCH 38/90] Add onion node
Apologies for forgetting this a few minutes ago, despite me adding this to the guides.cakewallet.com website this morning! Related to CW-252 (no notice is added in this commit)
---
assets/node_list.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/assets/node_list.yml b/assets/node_list.yml
index 39b440c9f..fccc968cf 100644
--- a/assets/node_list.yml
+++ b/assets/node_list.yml
@@ -1,6 +1,9 @@
-
uri: xmr-node.cakewallet.com:18081
is_default: true
+-
+ uri: cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081
+ is_default: false
-
uri: node.sethforprivacy.com:18089
is_default: false
From bd65fd8782fede5e01d1399b449448eb06edaba9 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:14:31 +0200
Subject: [PATCH 39/90] Upload APK to github artifacts Rename apk
---
.github/workflows/pr_test_build.yml | 187 +++++++++++++++-------------
1 file changed, 102 insertions(+), 85 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index dd2f1edeb..398f1edd5 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -11,89 +11,89 @@ jobs:
steps:
- uses: actions/checkout@v2
- - uses: actions/setup-java@v1
- with:
- java-version: '8.x'
-
- - name: Flutter action
- uses: subosito/flutter-action@v1
- with:
- flutter-version: '3.3.x'
- channel: stable
-
- - name: Install package dependencies
- run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
-
- - name: Execute Build and Setup Commands
- run: |
- sudo mkdir -p /opt/android
- sudo chown $USER /opt/android
- cd /opt/android
- git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
- cd cake_wallet/scripts/android/
- ./install_ndk.sh
- source ./app_env.sh cakewallet
- ./app_config.sh
- ./build_all.sh
- ./copy_monero_deps.sh
-
- - name: Install Flutter dependencies
- run: |
- cd /opt/android/cake_wallet
- flutter pub get
-
- - name: Generate KeyStore
- run: |
- cd /opt/android/cake_wallet/android/app
- keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass ${{ secrets.STORE_PASS }} -keypass ${{ secrets.KEY_PASS }}
-
- - name: Generate key properties
- run: |
- cd /opt/android/cake_wallet
- flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=${{ secrets.STORE_PASS }} keyPassword=${{ secrets.KEY_PASS }}
-
- - name: Generate localization
- run: |
- cd /opt/android/cake_wallet
- flutter packages pub run tool/generate_localization.dart
-
- - name: Build generated code
- run: |
- cd /opt/android/cake_wallet
- cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
- cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
- cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
- cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
- flutter packages pub run build_runner build --delete-conflicting-outputs
-
- - name: Add secrets
- run: |
- cd /opt/android/cake_wallet
- touch lib/.secrets.g.dart
- echo "const salt = '${{ secrets.SALT }}';" > lib/.secrets.g.dart
- echo "const keychainSalt = '${{ secrets.KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
- echo "const key = '${{ secrets.KEY }}';" >> lib/.secrets.g.dart
- echo "const walletSalt = '${{ secrets.WALLET_SALT }}';" >> lib/.secrets.g.dart
- echo "const shortKey = '${{ secrets.SHORT_KEY }}';" >> lib/.secrets.g.dart
- echo "const backupSalt = '${{ secrets.BACKUP_SALT }}';" >> lib/.secrets.g.dart
- echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
- echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
- echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
- echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
- echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
- echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart
- echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart
- echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart
- echo "const sideShiftApiKey = '${{ secrets.SIDE_SHIFT_API_KEY }}';" >> lib/.secrets.g.dart
- echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart
- echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart
- echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
- echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
-
- - name: Build
- run: |
- cd /opt/android/cake_wallet
- flutter build apk --release
+# - uses: actions/setup-java@v1
+# with:
+# java-version: '8.x'
+#
+# - name: Flutter action
+# uses: subosito/flutter-action@v1
+# with:
+# flutter-version: '3.3.x'
+# channel: stable
+#
+# - name: Install package dependencies
+# run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
+#
+# - name: Execute Build and Setup Commands
+# run: |
+# sudo mkdir -p /opt/android
+# sudo chown $USER /opt/android
+# cd /opt/android
+# git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
+# cd cake_wallet/scripts/android/
+# ./install_ndk.sh
+# source ./app_env.sh cakewallet
+# ./app_config.sh
+# ./build_all.sh
+# ./copy_monero_deps.sh
+#
+# - name: Install Flutter dependencies
+# run: |
+# cd /opt/android/cake_wallet
+# flutter pub get
+#
+# - name: Generate KeyStore
+# run: |
+# cd /opt/android/cake_wallet/android/app
+# keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass ${{ secrets.STORE_PASS }} -keypass ${{ secrets.KEY_PASS }}
+#
+# - name: Generate key properties
+# run: |
+# cd /opt/android/cake_wallet
+# flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=${{ secrets.STORE_PASS }} keyPassword=${{ secrets.KEY_PASS }}
+#
+# - name: Generate localization
+# run: |
+# cd /opt/android/cake_wallet
+# flutter packages pub run tool/generate_localization.dart
+#
+# - name: Build generated code
+# run: |
+# cd /opt/android/cake_wallet
+# cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+# cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+# cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+# cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+# flutter packages pub run build_runner build --delete-conflicting-outputs
+#
+# - name: Add secrets
+# run: |
+# cd /opt/android/cake_wallet
+# touch lib/.secrets.g.dart
+# echo "const salt = '${{ secrets.SALT }}';" > lib/.secrets.g.dart
+# echo "const keychainSalt = '${{ secrets.KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+# echo "const key = '${{ secrets.KEY }}';" >> lib/.secrets.g.dart
+# echo "const walletSalt = '${{ secrets.WALLET_SALT }}';" >> lib/.secrets.g.dart
+# echo "const shortKey = '${{ secrets.SHORT_KEY }}';" >> lib/.secrets.g.dart
+# echo "const backupSalt = '${{ secrets.BACKUP_SALT }}';" >> lib/.secrets.g.dart
+# echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+# echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+# echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
+# echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
+# echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
+# echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart
+# echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart
+# echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart
+# echo "const sideShiftApiKey = '${{ secrets.SIDE_SHIFT_API_KEY }}';" >> lib/.secrets.g.dart
+# echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart
+# echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart
+# echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
+# echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
+#
+# - name: Build
+# run: |
+# cd /opt/android/cake_wallet
+# flutter build apk --release
# - name: Push to App Center
# run: |
@@ -108,9 +108,26 @@ jobs:
# --token ${{ secrets.APP_CENTER_TOKEN }} \
# --quiet
+# - name: Send Test APK
+# run: |
+# cd /opt/android/cake_wallet
+# var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/app-release.apk)
+# curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
+
+
- name: Send Test APK
run: |
- cd /opt/android/cake_wallet
- var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/app-release.apk)
+ var=$(curl --upload-file pubspec_base.yaml https://transfer.sh/$GITHUB_HEAD_REF.apk)
curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
+ - name: Rename apk
+ - run: |
+ mv pubspec_base.yaml $GITHUB_HEAD_REF.apk
+ ls
+
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-apks-artifacts
+ path: $GITHUB_HEAD_REF.apk
+
From b70838a308d7f3c9ef209ef7a1f3cc2245737297 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:16:04 +0200
Subject: [PATCH 40/90] Upload APK to github artifacts Rename apk
---
.github/workflows/pr_test_build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 398f1edd5..cdab77afb 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -121,7 +121,7 @@ jobs:
curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
- name: Rename apk
- - run: |
+ run: |
mv pubspec_base.yaml $GITHUB_HEAD_REF.apk
ls
From b62e4cb0648a0014b5fbd339f52c06d03cae1ea8 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:19:43 +0200
Subject: [PATCH 41/90] fix artifact path
---
.github/workflows/pr_test_build.yml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index cdab77afb..e016cbf8f 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -111,15 +111,9 @@ jobs:
# - name: Send Test APK
# run: |
# cd /opt/android/cake_wallet
-# var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/app-release.apk)
+# var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/$GITHUB_HEAD_REF.apk)
# curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
-
- - name: Send Test APK
- run: |
- var=$(curl --upload-file pubspec_base.yaml https://transfer.sh/$GITHUB_HEAD_REF.apk)
- curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
-
- name: Rename apk
run: |
mv pubspec_base.yaml $GITHUB_HEAD_REF.apk
@@ -129,5 +123,5 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: test-apks-artifacts
- path: $GITHUB_HEAD_REF.apk
+ path: "\${{GITHUB_HEAD_REF}}.apk"
From fb2e7306ad5949497e286f829297796d3f7deb5c Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:23:58 +0200
Subject: [PATCH 42/90] fix artifact path
---
.github/workflows/pr_test_build.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index e016cbf8f..d09b938b3 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -116,12 +116,13 @@ jobs:
- name: Rename apk
run: |
- mv pubspec_base.yaml $GITHUB_HEAD_REF.apk
+ mkdir test-apk
+ mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
ls
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: test-apks-artifacts
- path: "\${{GITHUB_HEAD_REF}}.apk"
+ path: test-apk/*
From 28f1afd972b1dcab96a5ff76ffdbafe91f2ec17d Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:26:39 +0200
Subject: [PATCH 43/90] try different file
---
.github/workflows/pr_test_build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index d09b938b3..71c8a6d0e 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -117,7 +117,7 @@ jobs:
- name: Rename apk
run: |
mkdir test-apk
- mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
+ mv pubspec_base.yaml test-apk/second-test.apk
ls
- name: Upload Artifact
From 9b20af929204cb6cb0913ccfa101ef14c59cb4ca Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:33:09 +0200
Subject: [PATCH 44/90] try different file
---
.github/workflows/pr_test_build.yml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 71c8a6d0e..b2639e5e7 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -114,15 +114,22 @@ jobs:
# var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/$GITHUB_HEAD_REF.apk)
# curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
+# - name: Rename apk
+# run: |
+# cd /opt/android/cake_wallet/build/app/outputs/apk/release
+# mkdir test-apk
+# mv app-release.apk test-apk/$GITHUB_HEAD_REF.apk
+
- name: Rename apk
run: |
mkdir test-apk
- mv pubspec_base.yaml test-apk/second-test.apk
+ mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
+ cd test-apk
ls
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: test-apks-artifacts
- path: test-apk/*
+ path: test-apk/"$GITHUB_HEAD_REF".apk
From 1198b164556380c8b63e1f011d2afc61ecbf877d Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:37:56 +0200
Subject: [PATCH 45/90] Try uploading single apk file
---
.github/workflows/pr_test_build.yml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index b2639e5e7..595ff3def 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -126,10 +126,22 @@ jobs:
mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
cd test-apk
ls
+ apkPath=pwd/$GITHUB_HEAD_REF.apk
+ echo "===================="
+ echo apkPath
+ echo "===================="
- name: Upload Artifact
+ continue-on-error: true
uses: actions/upload-artifact@v3
with:
name: test-apks-artifacts
- path: test-apk/"$GITHUB_HEAD_REF".apk
+ path: apkPath
+
+ - name: Upload Artifact
+ continue-on-error: true
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-apks-artifacts
+ path: $apkPath
From 0c8636a77856f93b2c901abcce7367c6b452a691 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:46:03 +0200
Subject: [PATCH 46/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 595ff3def..01895c1fb 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -128,20 +128,30 @@ jobs:
ls
apkPath=pwd/$GITHUB_HEAD_REF.apk
echo "===================="
- echo apkPath
+ echo $apkPath
echo "===================="
+ echo "artifactPath=test-apk/${{ GITHUB_HEAD_REF.apk }}" >> $GITHUB_ENV
+ echo ${{ env.artifactPath }}
- name: Upload Artifact
continue-on-error: true
uses: actions/upload-artifact@v3
with:
name: test-apks-artifacts
- path: apkPath
+ path: test-apk/${{ GITHUB_HEAD_REF }}.apk
- name: Upload Artifact
continue-on-error: true
uses: actions/upload-artifact@v3
with:
name: test-apks-artifacts
- path: $apkPath
+ path: ${{ apkPath }}
+
+ - name: Upload Artifact
+ continue-on-error: true
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-apks-artifacts
+ path: ${{ env.artifactPath }}
+ retention-days: 30
From e78ef3c201a385b0fb40e478cf9444b74e93bfda Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:48:01 +0200
Subject: [PATCH 47/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 01895c1fb..8a8760aad 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -126,7 +126,7 @@ jobs:
mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
cd test-apk
ls
- apkPath=pwd/$GITHUB_HEAD_REF.apk
+ apkPath=pwd/${{ GITHUB_HEAD_REF }}.apk
echo "===================="
echo $apkPath
echo "===================="
From 12f4b9339c1659711137e9b2a4b59757a7b63f82 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:50:46 +0200
Subject: [PATCH 48/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 8a8760aad..818b0b8c9 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -126,12 +126,16 @@ jobs:
mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
cd test-apk
ls
- apkPath=pwd/${{ GITHUB_HEAD_REF }}.apk
+ apkPath=pwd/$GITHUB_HEAD_REF.apk
echo "===================="
echo $apkPath
echo "===================="
- echo "artifactPath=test-apk/${{ GITHUB_HEAD_REF.apk }}" >> $GITHUB_ENV
+ echo "artifactPath=test-apk/$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
+ echo "artifactPath2=test-apk/\$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
+ echo "artifactPath3=test-apk/\${{ GITHUB_HEAD_REF.apk }}" >> $GITHUB_ENV
echo ${{ env.artifactPath }}
+ echo ${{ env.artifactPath2 }}
+ echo ${{ env.artifactPath3 }}
- name: Upload Artifact
continue-on-error: true
@@ -153,5 +157,21 @@ jobs:
with:
name: test-apks-artifacts
path: ${{ env.artifactPath }}
- retention-days: 30
+ retention-days: 1
+
+ - name: Upload Artifact
+ continue-on-error: true
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-apks-artifacts
+ path: ${{ env.artifactPath2 }}
+ retention-days: 1
+
+ - name: Upload Artifact
+ continue-on-error: true
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-apks-artifacts
+ path: ${{ env.artifactPath3 }}
+ retention-days: 1
From 71989cf6d79e977d772d55b8b5c232db824ef83b Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:52:04 +0200
Subject: [PATCH 49/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 818b0b8c9..f1dae682b 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -142,7 +142,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: test-apks-artifacts
- path: test-apk/${{ GITHUB_HEAD_REF }}.apk
+ path: test-apk/${{ $GITHUB_HEAD_REF }}.apk
- name: Upload Artifact
continue-on-error: true
From 8daf20753bd9ad9ff60bb70addb494188d29620c Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:52:33 +0200
Subject: [PATCH 50/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index f1dae682b..523f70725 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -137,13 +137,6 @@ jobs:
echo ${{ env.artifactPath2 }}
echo ${{ env.artifactPath3 }}
- - name: Upload Artifact
- continue-on-error: true
- uses: actions/upload-artifact@v3
- with:
- name: test-apks-artifacts
- path: test-apk/${{ $GITHUB_HEAD_REF }}.apk
-
- name: Upload Artifact
continue-on-error: true
uses: actions/upload-artifact@v3
From 903cd7bf6f10c922765b42f29cd961500b6aef04 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:53:15 +0200
Subject: [PATCH 51/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 523f70725..d9509e813 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -137,13 +137,6 @@ jobs:
echo ${{ env.artifactPath2 }}
echo ${{ env.artifactPath3 }}
- - name: Upload Artifact
- continue-on-error: true
- uses: actions/upload-artifact@v3
- with:
- name: test-apks-artifacts
- path: ${{ apkPath }}
-
- name: Upload Artifact
continue-on-error: true
uses: actions/upload-artifact@v3
From e516bd7a07e6b55ad389cede51dafcb0ce842912 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:55:29 +0200
Subject: [PATCH 52/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 38 ++++++++++++++---------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index d9509e813..9e9393ed9 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -131,11 +131,11 @@ jobs:
echo $apkPath
echo "===================="
echo "artifactPath=test-apk/$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
- echo "artifactPath2=test-apk/\$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
- echo "artifactPath3=test-apk/\${{ GITHUB_HEAD_REF.apk }}" >> $GITHUB_ENV
+# echo "artifactPath2=test-apk/\$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
+# echo "artifactPath3=test-apk/\${{ GITHUB_HEAD_REF.apk }}" >> $GITHUB_ENV
echo ${{ env.artifactPath }}
- echo ${{ env.artifactPath2 }}
- echo ${{ env.artifactPath3 }}
+# echo ${{ env.artifactPath2 }}
+# echo ${{ env.artifactPath3 }}
- name: Upload Artifact
continue-on-error: true
@@ -145,19 +145,19 @@ jobs:
path: ${{ env.artifactPath }}
retention-days: 1
- - name: Upload Artifact
- continue-on-error: true
- uses: actions/upload-artifact@v3
- with:
- name: test-apks-artifacts
- path: ${{ env.artifactPath2 }}
- retention-days: 1
-
- - name: Upload Artifact
- continue-on-error: true
- uses: actions/upload-artifact@v3
- with:
- name: test-apks-artifacts
- path: ${{ env.artifactPath3 }}
- retention-days: 1
+# - name: Upload Artifact
+# continue-on-error: true
+# uses: actions/upload-artifact@v3
+# with:
+# name: test-apks-artifacts
+# path: ${{ env.artifactPath2 }}
+# retention-days: 1
+#
+# - name: Upload Artifact
+# continue-on-error: true
+# uses: actions/upload-artifact@v3
+# with:
+# name: test-apks-artifacts
+# path: ${{ env.artifactPath3 }}
+# retention-days: 1
From bd1a5cf3f7733a1cf426f40364346d213a2e3ef7 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 14:56:27 +0200
Subject: [PATCH 53/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 9e9393ed9..0304171b8 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -131,11 +131,7 @@ jobs:
echo $apkPath
echo "===================="
echo "artifactPath=test-apk/$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
-# echo "artifactPath2=test-apk/\$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
-# echo "artifactPath3=test-apk/\${{ GITHUB_HEAD_REF.apk }}" >> $GITHUB_ENV
echo ${{ env.artifactPath }}
-# echo ${{ env.artifactPath2 }}
-# echo ${{ env.artifactPath3 }}
- name: Upload Artifact
continue-on-error: true
From 5364dd87107c8699690a25bd394a171bedb550de Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 15:01:20 +0200
Subject: [PATCH 54/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 0304171b8..5121be130 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -135,11 +135,9 @@ jobs:
- name: Upload Artifact
continue-on-error: true
- uses: actions/upload-artifact@v3
+ uses: kittaakos/upload-artifact-as-is@v0
with:
- name: test-apks-artifacts
- path: ${{ env.artifactPath }}
- retention-days: 1
+ path: test-apk/
# - name: Upload Artifact
# continue-on-error: true
From e264cb326db4f75dbd764d8fcd2c5978ca270592 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 15:15:56 +0200
Subject: [PATCH 55/90] Try uploading renamed apk file
---
.github/workflows/pr_test_build.yml | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 5121be130..8b038687b 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -124,34 +124,8 @@ jobs:
run: |
mkdir test-apk
mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
- cd test-apk
- ls
- apkPath=pwd/$GITHUB_HEAD_REF.apk
- echo "===================="
- echo $apkPath
- echo "===================="
- echo "artifactPath=test-apk/$GITHUB_HEAD_REF.apk" >> $GITHUB_ENV
- echo ${{ env.artifactPath }}
- name: Upload Artifact
- continue-on-error: true
uses: kittaakos/upload-artifact-as-is@v0
with:
path: test-apk/
-
-# - name: Upload Artifact
-# continue-on-error: true
-# uses: actions/upload-artifact@v3
-# with:
-# name: test-apks-artifacts
-# path: ${{ env.artifactPath2 }}
-# retention-days: 1
-#
-# - name: Upload Artifact
-# continue-on-error: true
-# uses: actions/upload-artifact@v3
-# with:
-# name: test-apks-artifacts
-# path: ${{ env.artifactPath3 }}
-# retention-days: 1
-
From d38b3b0e0675a8c3e1dadef067981298c111c283 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 15:19:51 +0200
Subject: [PATCH 56/90] Finalize upload to artifacts and renaming
---
.github/workflows/pr_test_build.yml | 187 ++++++++++++++--------------
1 file changed, 91 insertions(+), 96 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 8b038687b..5611fe578 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -11,89 +11,89 @@ jobs:
steps:
- uses: actions/checkout@v2
-# - uses: actions/setup-java@v1
-# with:
-# java-version: '8.x'
-#
-# - name: Flutter action
-# uses: subosito/flutter-action@v1
-# with:
-# flutter-version: '3.3.x'
-# channel: stable
-#
-# - name: Install package dependencies
-# run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
-#
-# - name: Execute Build and Setup Commands
-# run: |
-# sudo mkdir -p /opt/android
-# sudo chown $USER /opt/android
-# cd /opt/android
-# git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
-# cd cake_wallet/scripts/android/
-# ./install_ndk.sh
-# source ./app_env.sh cakewallet
-# ./app_config.sh
-# ./build_all.sh
-# ./copy_monero_deps.sh
-#
-# - name: Install Flutter dependencies
-# run: |
-# cd /opt/android/cake_wallet
-# flutter pub get
-#
-# - name: Generate KeyStore
-# run: |
-# cd /opt/android/cake_wallet/android/app
-# keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass ${{ secrets.STORE_PASS }} -keypass ${{ secrets.KEY_PASS }}
-#
-# - name: Generate key properties
-# run: |
-# cd /opt/android/cake_wallet
-# flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=${{ secrets.STORE_PASS }} keyPassword=${{ secrets.KEY_PASS }}
-#
-# - name: Generate localization
-# run: |
-# cd /opt/android/cake_wallet
-# flutter packages pub run tool/generate_localization.dart
-#
-# - name: Build generated code
-# run: |
-# cd /opt/android/cake_wallet
-# cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
-# cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
-# cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
-# cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
-# flutter packages pub run build_runner build --delete-conflicting-outputs
-#
-# - name: Add secrets
-# run: |
-# cd /opt/android/cake_wallet
-# touch lib/.secrets.g.dart
-# echo "const salt = '${{ secrets.SALT }}';" > lib/.secrets.g.dart
-# echo "const keychainSalt = '${{ secrets.KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
-# echo "const key = '${{ secrets.KEY }}';" >> lib/.secrets.g.dart
-# echo "const walletSalt = '${{ secrets.WALLET_SALT }}';" >> lib/.secrets.g.dart
-# echo "const shortKey = '${{ secrets.SHORT_KEY }}';" >> lib/.secrets.g.dart
-# echo "const backupSalt = '${{ secrets.BACKUP_SALT }}';" >> lib/.secrets.g.dart
-# echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
-# echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
-# echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
-# echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
-# echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
-# echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart
-# echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart
-# echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart
-# echo "const sideShiftApiKey = '${{ secrets.SIDE_SHIFT_API_KEY }}';" >> lib/.secrets.g.dart
-# echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart
-# echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart
-# echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
-# echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
-#
-# - name: Build
-# run: |
-# cd /opt/android/cake_wallet
-# flutter build apk --release
+ - uses: actions/setup-java@v1
+ with:
+ java-version: '8.x'
+
+ - name: Flutter action
+ uses: subosito/flutter-action@v1
+ with:
+ flutter-version: '3.3.x'
+ channel: stable
+
+ - name: Install package dependencies
+ run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
+
+ - name: Execute Build and Setup Commands
+ run: |
+ sudo mkdir -p /opt/android
+ sudo chown $USER /opt/android
+ cd /opt/android
+ git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
+ cd cake_wallet/scripts/android/
+ ./install_ndk.sh
+ source ./app_env.sh cakewallet
+ ./app_config.sh
+ ./build_all.sh
+ ./copy_monero_deps.sh
+
+ - name: Install Flutter dependencies
+ run: |
+ cd /opt/android/cake_wallet
+ flutter pub get
+
+ - name: Generate KeyStore
+ run: |
+ cd /opt/android/cake_wallet/android/app
+ keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass ${{ secrets.STORE_PASS }} -keypass ${{ secrets.KEY_PASS }}
+
+ - name: Generate key properties
+ run: |
+ cd /opt/android/cake_wallet
+ flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=${{ secrets.STORE_PASS }} keyPassword=${{ secrets.KEY_PASS }}
+
+ - name: Generate localization
+ run: |
+ cd /opt/android/cake_wallet
+ flutter packages pub run tool/generate_localization.dart
+
+ - name: Build generated code
+ run: |
+ cd /opt/android/cake_wallet
+ cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+ flutter packages pub run build_runner build --delete-conflicting-outputs
+
+ - name: Add secrets
+ run: |
+ cd /opt/android/cake_wallet
+ touch lib/.secrets.g.dart
+ echo "const salt = '${{ secrets.SALT }}';" > lib/.secrets.g.dart
+ echo "const keychainSalt = '${{ secrets.KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+ echo "const key = '${{ secrets.KEY }}';" >> lib/.secrets.g.dart
+ echo "const walletSalt = '${{ secrets.WALLET_SALT }}';" >> lib/.secrets.g.dart
+ echo "const shortKey = '${{ secrets.SHORT_KEY }}';" >> lib/.secrets.g.dart
+ echo "const backupSalt = '${{ secrets.BACKUP_SALT }}';" >> lib/.secrets.g.dart
+ echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+ echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
+ echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
+ echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart
+ echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart
+ echo "const sideShiftApiKey = '${{ secrets.SIDE_SHIFT_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart
+ echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
+ echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
+
+ - name: Build
+ run: |
+ cd /opt/android/cake_wallet
+ flutter build apk --release
# - name: Push to App Center
# run: |
@@ -108,24 +108,19 @@ jobs:
# --token ${{ secrets.APP_CENTER_TOKEN }} \
# --quiet
-# - name: Send Test APK
-# run: |
-# cd /opt/android/cake_wallet
-# var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/$GITHUB_HEAD_REF.apk)
-# curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
-
-# - name: Rename apk
-# run: |
-# cd /opt/android/cake_wallet/build/app/outputs/apk/release
-# mkdir test-apk
-# mv app-release.apk test-apk/$GITHUB_HEAD_REF.apk
+ - name: Send Test APK
+ run: |
+ cd /opt/android/cake_wallet
+ var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/$GITHUB_HEAD_REF.apk)
+ curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
- name: Rename apk
run: |
+ cd /opt/android/cake_wallet/build/app/outputs/apk/release
mkdir test-apk
- mv pubspec_base.yaml test-apk/$GITHUB_HEAD_REF.apk
+ mv app-release.apk test-apk/$GITHUB_HEAD_REF.apk
- name: Upload Artifact
uses: kittaakos/upload-artifact-as-is@v0
with:
- path: test-apk/
+ path: /opt/android/cake_wallet/build/app/outputs/apk/release/test-apk/
From 03a64b16859eb8951de25f66eed9b98787457c61 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 29 Nov 2022 15:49:24 +0200
Subject: [PATCH 57/90] Rename app and apk to ease testing process
---
.github/workflows/pr_test_build.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 5611fe578..190b891e1 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -90,6 +90,9 @@ jobs:
echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
+ - name: Rename app
+ run: sed -i -e "s/\${APP_NAME}/$GITHUB_HEAD_REF/g" /opt/android/cake_wallet/android/app/src/main/AndroidManifest.xml
+
- name: Build
run: |
cd /opt/android/cake_wallet
@@ -111,10 +114,10 @@ jobs:
- name: Send Test APK
run: |
cd /opt/android/cake_wallet
- var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/$GITHUB_HEAD_REF.apk)
+ var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/$GITHUB_HEAD_REF.apk -H "Max-Days: 10")
curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
- - name: Rename apk
+ - name: Rename apk file
run: |
cd /opt/android/cake_wallet/build/app/outputs/apk/release
mkdir test-apk
From 6685fb580485eda3b7e1f77e24b43b3f79cdc28a Mon Sep 17 00:00:00 2001
From: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
Date: Tue, 29 Nov 2022 11:05:38 -0600
Subject: [PATCH 58/90] [CW-257] Change Bitcoin block explorer to mempool.space
---
lib/view_model/transaction_details_view_model.dart | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart
index 8992071fd..f8729715b 100644
--- a/lib/view_model/transaction_details_view_model.dart
+++ b/lib/view_model/transaction_details_view_model.dart
@@ -184,7 +184,7 @@ abstract class TransactionDetailsViewModelBase with Store {
case WalletType.monero:
return 'https://monero.com/tx/${txId}';
case WalletType.bitcoin:
- return 'https://www.blockchain.com/btc/tx/${txId}';
+ return 'https://mempool.space/tx/${txId}';
case WalletType.litecoin:
return 'https://blockchair.com/litecoin/transaction/${txId}';
case WalletType.haven:
@@ -199,7 +199,7 @@ abstract class TransactionDetailsViewModelBase with Store {
case WalletType.monero:
return S.current.view_transaction_on + 'Monero.com';
case WalletType.bitcoin:
- return S.current.view_transaction_on + 'Blockchain.com';
+ return S.current.view_transaction_on + 'mempool.space';
case WalletType.litecoin:
return S.current.view_transaction_on + 'Blockchair.com';
case WalletType.haven:
From 59ee7aa975750ba17071916d4bd71c2a8cb19543 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 30 Nov 2022 01:37:56 +0200
Subject: [PATCH 59/90] Add onion node to already existing users
---
lib/entities/default_settings_migration.dart | 22 ++++++++++++++------
lib/main.dart | 2 +-
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index fb404cd88..27ada0b0c 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -135,19 +135,29 @@ Future defaultSettingsMigration(
await changeDefaultHavenNode(nodes);
break;
+ case 18:
+ await addOnionNode(nodes);
+ break;
+
default:
break;
}
await sharedPreferences.setInt(
- 'current_default_settings_migration_version', version);
+ PreferencesKey.currentDefaultSettingsMigrationVersion, version);
} catch (e) {
print('Migration error: ${e.toString()}');
}
});
await sharedPreferences.setInt(
- 'current_default_settings_migration_version', version);
+ PreferencesKey.currentDefaultSettingsMigrationVersion, version);
+}
+
+Future<void> addOnionNode(Box<Node> nodes) async {
+ final onionNodeUri = "cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081";
+
+ await nodes.add(Node(uri: onionNodeUri, type: WalletType.monero));
}
Future<void> replaceNodesMigration({required Box<Node> nodes}) async {
@@ -178,7 +188,7 @@ Future<void> changeMoneroCurrentNodeToDefault(
final node = getMoneroDefaultNode(nodes: nodes);
final nodeId = node?.key as int ?? 0; // 0 - England
- await sharedPreferences.setInt('current_node_id', nodeId);
+ await sharedPreferences.setInt(PreferencesKey.currentNodeIdKey, nodeId);
}
Node? getBitcoinDefaultElectrumServer({required Box<Node> nodes}) {
@@ -225,7 +235,7 @@ Future<void> changeBitcoinCurrentElectrumServerToDefault(
final server = getBitcoinDefaultElectrumServer(nodes: nodes);
final serverId = server?.key as int ?? 0;
- await sharedPreferences.setInt('current_node_id_btc', serverId);
+ await sharedPreferences.setInt(PreferencesKey.currentBitcoinElectrumSererIdKey, serverId);
}
Future<void> changeLitecoinCurrentElectrumServerToDefault(
@@ -234,7 +244,7 @@ Future<void> changeLitecoinCurrentElectrumServerToDefault(
final server = getLitecoinDefaultElectrumServer(nodes: nodes);
final serverId = server?.key as int ?? 0;
- await sharedPreferences.setInt('current_node_id_ltc', serverId);
+ await sharedPreferences.setInt(PreferencesKey.currentLitecoinElectrumSererIdKey, serverId);
}
Future<void> changeHavenCurrentNodeToDefault(
@@ -254,7 +264,7 @@ Future<void> replaceDefaultNode(
'eu-node.cakewallet.io:18081',
'node.cakewallet.io:18081'
];
- final currentNodeId = sharedPreferences.getInt('current_node_id');
+ final currentNodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
final currentNode =
nodes.values.firstWhereOrNull((Node node) => node.key == currentNodeId);
final needToReplace =
diff --git a/lib/main.dart b/lib/main.dart
index 3cd5679b3..e1fade7b4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -128,7 +128,7 @@ Future<void> main() async {
exchangeTemplates: exchangeTemplates,
transactionDescriptions: transactionDescriptions,
secureStorage: secureStorage,
- initialMigrationVersion: 17);
+ initialMigrationVersion: 18);
runApp(App());
} catch (e, stacktrace) {
runApp(MaterialApp(
From 28abb4ded0589915444f2d7a46653ae70b455848 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Wed, 30 Nov 2022 15:28:27 +0200
Subject: [PATCH 60/90] Add localization strings
---
res/values/strings_de.arb | 3 +++
res/values/strings_es.arb | 3 +++
res/values/strings_fr.arb | 3 +++
res/values/strings_hi.arb | 3 +++
res/values/strings_hr.arb | 3 +++
res/values/strings_it.arb | 3 +++
res/values/strings_ja.arb | 3 +++
res/values/strings_ko.arb | 3 +++
res/values/strings_nl.arb | 3 +++
res/values/strings_pl.arb | 3 +++
res/values/strings_pt.arb | 3 +++
res/values/strings_ru.arb | 3 +++
res/values/strings_uk.arb | 3 +++
res/values/strings_zh.arb | 3 +++
14 files changed, 42 insertions(+)
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index e4854066b..ca09f67d5 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -652,6 +652,9 @@
"use_suggested": "Vorgeschlagen verwenden",
"do_not_share_warning_text" : "Teilen Sie diese nicht mit anderen, einschließlich des Supports.\n\nSie werden Ihr Geld stehlen!",
"help": "hilfe",
+ "connection_sync": "Verbindung und Synchronisierung",
+ "security_and_backup": "Sicherheit und Datensicherung",
+ "create_backup": "Backup erstellen",
"privacy_settings": "Datenschutzeinstellungen",
"privacy": "Datenschutz",
"display_settings": "Anzeigeeinstellungen",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 456f23dec..84b39e5b7 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -652,6 +652,9 @@
"use_suggested": "Usar sugerido",
"do_not_share_warning_text" : "No comparta estos con nadie más, incluido el soporte.\n\n¡Te robarán tu dinero!",
"help": "ayuda",
+ "connection_sync": "Conexión y sincronización",
+ "security_and_backup": "Seguridad y respaldo",
+ "create_backup": "Crear copia de seguridad",
"privacy_settings": "Configuración de privacidad",
"privacy": "Privacidad",
"display_settings": "Configuración de pantalla",
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index daae787b9..215b58245 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -650,6 +650,9 @@
"use_suggested": "Utilisation suggérée",
"do_not_share_warning_text" : "Ne les partagez avec personne d'autre, y compris avec l'assistance.\n\nIls vont voler votre argent!",
"help": "aider",
+ "connection_sync": "Connexion et synchronisation",
+ "security_and_backup": "Sécurité et sauvegarde",
+ "create_backup": "Créer une sauvegarde",
"privacy_settings": "Paramètres de confidentialité",
"privacy": "Confidentialité",
"display_settings": "Paramètres d'affichage",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 532e8ede4..133432391 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -652,6 +652,9 @@
"use_suggested": "सुझाए गए का प्रयोग करें",
"do_not_share_warning_text" : "इन्हें समर्थन सहित किसी और के साथ साझा न करें।\n\nवे आपका पैसा चुरा लेंगे!",
"help": "मदद करना",
+ "connection_sync": "कनेक्शन और सिंक",
+ "security_and_backup": "सुरक्षा और बैकअप",
+ "create_backup": "बैकअप बनाएँ",
"privacy_settings": "गोपनीयता सेटिंग्स",
"privacy": "गोपनीयता",
"display_settings": "प्रदर्शन सेटिंग्स",
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index e5c8598e1..1e8820130 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -652,6 +652,9 @@
"use_suggested": "Koristite predloženo",
"do_not_share_warning_text" : "Nemojte ih dijeliti ni s kim, uključujući podršku.\n\nUkrast će vam novac!",
"help": "pomozite",
+ "connection_sync": "Povezivanje i sinkronizacija",
+ "security_and_backup": "Sigurnost i sigurnosna kopija",
+ "create_backup": "Stvori sigurnosnu kopiju",
"privacy_settings": "Postavke privatnosti",
"privacy": "Privatnost",
"display_settings": "Postavke zaslona",
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 0a557ebb1..d16a6ce83 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -652,6 +652,9 @@
"use_suggested": "Usa suggerito",
"do_not_share_warning_text" : "Non condividerli con nessun altro, incluso il supporto.\n\nTi ruberanno i soldi!",
"help": "aiuto",
+ "connection_sync": "Connessione e sincronizzazione",
+ "security_and_backup": "Sicurezza e backup",
+ "create_backup": "Crea backup",
"privacy_settings": "Impostazioni privacy",
"privacy": "Privacy",
"display_settings": "Impostazioni di visualizzazione",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 16d88db49..c6a3f486c 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -652,6 +652,9 @@
"use_suggested": "推奨を使用",
"do_not_share_warning_text" : "サポートを含め、これらを他の誰とも共有しないでください。\n\n彼らはあなたのお金を盗みます！",
"help": "ヘルプ",
+ "connection_sync": "接続と同期",
+ "security_and_backup": "セキュリティとバックアップ",
+ "create_backup": "バックアップを作成",
"privacy_settings": "プライバシー設定",
"privacy": "プライバシー",
"display_settings": "表示設定",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 99fe560ed..8aa917572 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -652,6 +652,9 @@
"use_suggested": "추천 사용",
"do_not_share_warning_text" : "지원을 포함하여 다른 사람과 이러한 정보를 공유하지 마십시오.\n\n그들은 당신의 돈을 훔칠 것입니다!",
"help": "돕다",
+ "connection_sync": "연결 및 동기화",
+ "security_and_backup": "보안 및 백업",
+ "create_backup": "백업 생성",
"privacy_settings": "개인정보 설정",
"privacy": "프라이버시",
"display_settings": "디스플레이 설정",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index cc4c6bbb1..61382db9e 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -652,6 +652,9 @@
"use_suggested": "Gebruik aanbevolen",
"do_not_share_warning_text" : "Deel deze met niemand anders, ook niet met support.\n\nZe zullen je geld stelen!",
"help": "helpen",
+ "connection_sync": "Verbinding en synchronisatie",
+ "security_and_backup": "Beveiliging en back-up",
+ "create_backup": "Maak een back-up",
"privacy_settings": "Privacy-instellingen",
"privacy": "Privacy",
"display_settings": "Weergave-instellingen",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 0d0159f7a..dbf43ccc0 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -652,6 +652,9 @@
"use_suggested": "Użyj sugerowane",
"do_not_share_warning_text" : "Nie udostępniaj ich nikomu innemu, w tym wsparcia.\n\nUkradną twoje pieniądze!",
"help": "pomoc",
+ "connection_sync": "Połączenie i synchronizacja",
+ "security_and_backup": "Bezpieczeństwo i kopia zapasowa",
+ "create_backup": "Utwórz kopię zapasową",
"privacy_settings": "Ustawienia prywatności",
"privacy": "Prywatność",
"display_settings": "Ustawienia wyświetlania",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 6d87183ee..f5ecbf64e 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -652,6 +652,9 @@
"use_suggested": "Uso sugerido",
"do_not_share_warning_text" : "Não os compartilhe com mais ninguém, incluindo suporte.\n\nEles vão roubar seu dinheiro!",
"help": "ajuda",
+ "connection_sync": "Conexão e sincronização",
+ "security_and_backup": "Segurança e backup",
+ "create_backup": "Criar backup",
"privacy_settings": "Configurações de privacidade",
"privacy": "Privacidade",
"display_settings": "Configurações de exibição",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index d2ec428c8..9be18510f 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -652,6 +652,9 @@
"use_suggested": "Использовать предложенный",
"do_not_share_warning_text" : "Не делитесь ими с кем-либо еще, в том числе со службой поддержки.\n\nОни украдут ваши деньги!",
"help": "помощь",
+ "connection_sync": "Подключение и синхронизация",
+ "security_and_backup": "Безопасность и резервное копирование",
+ "create_backup": "Создать резервную копию",
"privacy_settings": "Настройки конфиденциальности",
"privacy": "Конфиденциальность",
"display_settings": "Настройки отображения",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 42170382e..6012c8289 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -651,6 +651,9 @@
"use_suggested": "Використати запропоноване",
"do_not_share_warning_text" : "Не повідомляйте їх нікому, включно зі службою підтримки.\n\nВони вкрадуть ваші гроші!",
"help": "допомога",
+ "connection_sync": "Підключення та синхронізація",
+ "security_and_backup": "Безпека та резервне копіювання",
+ "create_backup": "Створити резервну копію",
"privacy_settings": "Налаштування конфіденційності",
"privacy": "Конфіденційність",
"display_settings": "Налаштування дисплея",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 8ffa37def..6d45f6d01 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -650,6 +650,9 @@
"use_suggested": "使用建议",
"do_not_share_warning_text" : "不要與其他任何人分享這些內容，包括支持。\n\n他們會偷你的錢！",
"help": "帮助",
+ "connection_sync": "连接和同步",
+ "security_and_backup": "安全和备份",
+ "create_backup": "创建备份",
"privacy_settings": "隐私设置",
"privacy":"隐私",
"display_settings": "显示设置",
From ffd0079e1d231180d52f52ec51dba975fcfbbdc3 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 1 Dec 2022 14:29:03 +0200
Subject: [PATCH 61/90] Check if user already has onion node before adding it
---
lib/entities/default_settings_migration.dart | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index 27ada0b0c..9aff05500 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -157,7 +157,10 @@ Future defaultSettingsMigration(
Future<void> addOnionNode(Box<Node> nodes) async {
final onionNodeUri = "cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081";
- await nodes.add(Node(uri: onionNodeUri, type: WalletType.monero));
+ // check if the user has this node before (added it manually)
+ if (nodes.values.firstWhereOrNull((element) => element.uriRaw == onionNodeUri) == null) {
+ await nodes.add(Node(uri: onionNodeUri, type: WalletType.monero));
+ }
}
Future<void> replaceNodesMigration({required Box<Node> nodes}) async {
From 47764835c36680125e409f54f97646ed83034736 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 1 Dec 2022 18:09:21 +0200
Subject: [PATCH 62/90] Fix nullability issue in create trade response
---
lib/exchange/changenow/changenow_exchange_provider.dart | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
index 20f529733..9910c7b9a 100644
--- a/lib/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -114,7 +114,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
final uri = Uri.https(apiAuthority, createTradePath);
final response = await post(uri, headers: headers, body: json.encode(body));
-
+
if (response.statusCode == 400) {
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final error = responseJSON['error'] as String;
@@ -128,9 +128,9 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final id = responseJSON['id'] as String;
- final inputAddress = responseJSON['payinAddress'] as String;
- final refundAddress = responseJSON['refundAddress'] as String;
- final extraId = responseJSON['payinExtraId'] as String;
+ final inputAddress = responseJSON['payinAddress'] as String?;
+ final refundAddress = responseJSON['refundAddress'] as String?;
+ final extraId = responseJSON['payinExtraId'] as String?;
return Trade(
id: id,
From cbe31aa5aa60c269139f1c3e44be126337a274b2 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 1 Dec 2022 18:21:19 +0200
Subject: [PATCH 63/90] Revert allowing nullable values for input and refund
addresses
---
lib/exchange/changenow/changenow_exchange_provider.dart | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
index 9910c7b9a..96b6142e6 100644
--- a/lib/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -128,8 +128,8 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final id = responseJSON['id'] as String;
- final inputAddress = responseJSON['payinAddress'] as String?;
- final refundAddress = responseJSON['refundAddress'] as String?;
+ final inputAddress = responseJSON['payinAddress'] as String;
+ final refundAddress = responseJSON['refundAddress'] as String;
final extraId = responseJSON['payinExtraId'] as String?;
return Trade(
From 8d9c0f2a4670be9f163f4e3d614f786e4bd0cd73 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 1 Dec 2022 20:47:13 +0200
Subject: [PATCH 64/90] Add bash script to run all generation commands in one
time
---
model_generator.sh | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 model_generator.sh
diff --git a/model_generator.sh b/model_generator.sh
new file mode 100644
index 000000000..f4ef8bdad
--- /dev/null
+++ b/model_generator.sh
@@ -0,0 +1,5 @@
+cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+flutter packages pub run build_runner build --delete-conflicting-outputs
\ No newline at end of file
From 03748d680ad7eedce158962581cfd17cd57bed8b Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <godilite@gmail.com>
Date: Thu, 1 Dec 2022 21:21:51 +0200
Subject: [PATCH 65/90] [skip ci] format files
---
lib/src/screens/settings/privacy_page.dart | 36 +++++++++----------
.../settings/display_settings_view_model.dart | 30 +++++++---------
.../settings/other_settings_view_model.dart | 36 ++++++++-----------
.../settings/privacy_settings_view_model.dart | 16 ++++-----
.../security_settings_view_model.dart | 20 +++++------
5 files changed, 58 insertions(+), 80 deletions(-)
diff --git a/lib/src/screens/settings/privacy_page.dart b/lib/src/screens/settings/privacy_page.dart
index 47041b4fb..128d864f4 100644
--- a/lib/src/screens/settings/privacy_page.dart
+++ b/lib/src/screens/settings/privacy_page.dart
@@ -19,24 +19,24 @@ class PrivacyPage extends BasePage {
padding: EdgeInsets.only(top: 10),
child: Observer(builder: (_) {
return Observer(builder: (_) {
- return Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- SettingsSwitcherCell(
- title: S.current.disable_exchange,
- value: _privacySettingsViewModel.disableExchange,
- onValueChange: (BuildContext context, bool value) {
- _privacySettingsViewModel.setEnableExchange(value);
- }),
- SettingsSwitcherCell(
- title: S.current.settings_save_recipient_address,
- value: _privacySettingsViewModel.shouldSaveRecipientAddress,
- onValueChange: (BuildContext _, bool value) {
- _privacySettingsViewModel.setShouldSaveRecipientAddress(value);
- })
- ],
- );
- });
+ return Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ SettingsSwitcherCell(
+ title: S.current.disable_exchange,
+ value: _privacySettingsViewModel.disableExchange,
+ onValueChange: (BuildContext context, bool value) {
+ _privacySettingsViewModel.setEnableExchange(value);
+ }),
+ SettingsSwitcherCell(
+ title: S.current.settings_save_recipient_address,
+ value: _privacySettingsViewModel.shouldSaveRecipientAddress,
+ onValueChange: (BuildContext _, bool value) {
+ _privacySettingsViewModel.setShouldSaveRecipientAddress(value);
+ })
+ ],
+ );
+ });
}),
);
}
diff --git a/lib/view_model/settings/display_settings_view_model.dart b/lib/view_model/settings/display_settings_view_model.dart
index 3537dfa6e..4e73b3399 100644
--- a/lib/view_model/settings/display_settings_view_model.dart
+++ b/lib/view_model/settings/display_settings_view_model.dart
@@ -8,10 +8,9 @@ part 'display_settings_view_model.g.dart';
class DisplaySettingsViewModel = DisplaySettingsViewModelBase with _$DisplaySettingsViewModel;
-
abstract class DisplaySettingsViewModelBase with Store {
DisplaySettingsViewModelBase(
- this._settingsStore,
+ this._settingsStore,
);
final SettingsStore _settingsStore;
@@ -22,10 +21,8 @@ abstract class DisplaySettingsViewModelBase with Store {
@computed
String get languageCode => _settingsStore.languageCode;
-
@computed
- BalanceDisplayMode get balanceDisplayMode =>
- _settingsStore.balanceDisplayMode;
+ BalanceDisplayMode get balanceDisplayMode => _settingsStore.balanceDisplayMode;
@computed
bool get shouldDisplayBalance => balanceDisplayMode == BalanceDisplayMode.displayableBalance;
@@ -34,30 +31,27 @@ abstract class DisplaySettingsViewModelBase with Store {
ThemeBase get theme => _settingsStore.currentTheme;
@action
- void setBalanceDisplayMode(BalanceDisplayMode value) =>
- _settingsStore.balanceDisplayMode = value;
+ void setBalanceDisplayMode(BalanceDisplayMode value) => _settingsStore.balanceDisplayMode = value;
@action
- void setShouldDisplayBalance(bool value){
- if (value) {
- _settingsStore.balanceDisplayMode = BalanceDisplayMode.displayableBalance;
+ void setShouldDisplayBalance(bool value) {
+ if (value) {
+ _settingsStore.balanceDisplayMode = BalanceDisplayMode.displayableBalance;
} else {
- _settingsStore.balanceDisplayMode = BalanceDisplayMode.hiddenBalance;
+ _settingsStore.balanceDisplayMode = BalanceDisplayMode.hiddenBalance;
}
}
@action
- void onLanguageSelected (String code) {
+ void onLanguageSelected(String code) {
_settingsStore.languageCode = code;
}
@action
- void setTheme(ThemeBase newTheme){
- _settingsStore.currentTheme = newTheme;
+ void setTheme(ThemeBase newTheme) {
+ _settingsStore.currentTheme = newTheme;
}
@action
- void setFiatCurrency(FiatCurrency value) =>
- _settingsStore.fiatCurrency = value;
-
-}
\ No newline at end of file
+ void setFiatCurrency(FiatCurrency value) => _settingsStore.fiatCurrency = value;
+}
diff --git a/lib/view_model/settings/other_settings_view_model.dart b/lib/view_model/settings/other_settings_view_model.dart
index b0ba4c9b5..b964adc6e 100644
--- a/lib/view_model/settings/other_settings_view_model.dart
+++ b/lib/view_model/settings/other_settings_view_model.dart
@@ -12,32 +12,26 @@ import 'package:package_info/package_info.dart';
part 'other_settings_view_model.g.dart';
-class OtherSettingsViewModel = OtherSettingsViewModelBase
- with _$OtherSettingsViewModel;
-
+class OtherSettingsViewModel = OtherSettingsViewModelBase with _$OtherSettingsViewModel;
abstract class OtherSettingsViewModelBase with Store {
- OtherSettingsViewModelBase(this._settingsStore, WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
- TransactionInfo>
- wallet):
- walletType = wallet.type,
- _wallet = wallet,
- currentVersion = ''{
- PackageInfo.fromPlatform().then(
- (PackageInfo packageInfo) => currentVersion = packageInfo.version);
+ OtherSettingsViewModelBase(
+ this._settingsStore, WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo> wallet)
+ : walletType = wallet.type,
+ _wallet = wallet,
+ currentVersion = '' {
+ PackageInfo.fromPlatform().then((PackageInfo packageInfo) => currentVersion = packageInfo.version);
final priority = _settingsStore.priority[wallet.type];
final priorities = priorityForWalletType(wallet.type);
if (!priorities.contains(priority)) {
_settingsStore.priority[wallet.type] = priorities.first;
+ }
}
- }
-
- final WalletType walletType;
- final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
- TransactionInfo> _wallet;
+ final WalletType walletType;
+ final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo> _wallet;
@observable
String currentVersion;
@@ -55,11 +49,10 @@ abstract class OtherSettingsViewModelBase with Store {
return priority;
}
- String getDisplayPriority(dynamic priority) {
+ String getDisplayPriority(dynamic priority) {
final _priority = priority as TransactionPriority;
- if (_wallet.type == WalletType.bitcoin
- || _wallet.type == WalletType.litecoin) {
+ if (_wallet.type == WalletType.bitcoin || _wallet.type == WalletType.litecoin) {
final rate = bitcoin!.getFeeRate(_wallet, _priority);
return bitcoin!.bitcoinTransactionPriorityWithLabel(_priority, rate);
}
@@ -67,6 +60,5 @@ abstract class OtherSettingsViewModelBase with Store {
return priority.toString();
}
- void onDisplayPrioritySelected(TransactionPriority priority) =>
- _settingsStore.priority[_wallet.type] = priority;
-}
\ No newline at end of file
+ void onDisplayPrioritySelected(TransactionPriority priority) => _settingsStore.priority[_wallet.type] = priority;
+}
diff --git a/lib/view_model/settings/privacy_settings_view_model.dart b/lib/view_model/settings/privacy_settings_view_model.dart
index 8433e673a..88311bf1f 100644
--- a/lib/view_model/settings/privacy_settings_view_model.dart
+++ b/lib/view_model/settings/privacy_settings_view_model.dart
@@ -3,8 +3,7 @@ import 'package:mobx/mobx.dart';
part 'privacy_settings_view_model.g.dart';
-class PrivacySettingsViewModel = PrivacySettingsViewModelBase
- with _$PrivacySettingsViewModel;
+class PrivacySettingsViewModel = PrivacySettingsViewModelBase with _$PrivacySettingsViewModel;
abstract class PrivacySettingsViewModelBase with Store {
PrivacySettingsViewModelBase(this._settingsStore);
@@ -15,14 +14,11 @@ abstract class PrivacySettingsViewModelBase with Store {
bool get disableExchange => _settingsStore.disableExchange;
@computed
- bool get shouldSaveRecipientAddress =>
- _settingsStore.shouldSaveRecipientAddress;
+ bool get shouldSaveRecipientAddress => _settingsStore.shouldSaveRecipientAddress;
@action
- void setShouldSaveRecipientAddress(bool value) =>
- _settingsStore.shouldSaveRecipientAddress = value;
-
+ void setShouldSaveRecipientAddress(bool value) => _settingsStore.shouldSaveRecipientAddress = value;
+
@action
- void setEnableExchange(bool value) =>
- _settingsStore.disableExchange = value;
-}
\ No newline at end of file
+ void setEnableExchange(bool value) => _settingsStore.disableExchange = value;
+}
diff --git a/lib/view_model/settings/security_settings_view_model.dart b/lib/view_model/settings/security_settings_view_model.dart
index 9bf2fb6eb..4a88b633f 100644
--- a/lib/view_model/settings/security_settings_view_model.dart
+++ b/lib/view_model/settings/security_settings_view_model.dart
@@ -4,26 +4,22 @@ import 'package:mobx/mobx.dart';
part 'security_settings_view_model.g.dart';
-class SecuritySettingsViewModel = SecuritySettingsViewModelBase
- with _$SecuritySettingsViewModel;
+class SecuritySettingsViewModel = SecuritySettingsViewModelBase with _$SecuritySettingsViewModel;
abstract class SecuritySettingsViewModelBase with Store {
- SecuritySettingsViewModelBase(this._settingsStore): _biometricAuth = BiometricAuth();
+ SecuritySettingsViewModelBase(this._settingsStore) : _biometricAuth = BiometricAuth();
final BiometricAuth _biometricAuth;
final SettingsStore _settingsStore;
-
+
@computed
- bool get allowBiometricalAuthentication =>
- _settingsStore.allowBiometricalAuthentication;
+ bool get allowBiometricalAuthentication => _settingsStore.allowBiometricalAuthentication;
@action
- Future<bool> biometricAuthenticated()async{
- return await _biometricAuth.canCheckBiometrics() && await _biometricAuth.isAuthenticated();
+ Future<bool> biometricAuthenticated() async {
+ return await _biometricAuth.canCheckBiometrics() && await _biometricAuth.isAuthenticated();
}
@action
- void setAllowBiometricalAuthentication(bool value) =>
- _settingsStore.allowBiometricalAuthentication = value;
-
-}
\ No newline at end of file
+ void setAllowBiometricalAuthentication(bool value) => _settingsStore.allowBiometricalAuthentication = value;
+}
From 914fffe51cdec4ba880032dd53cfe925328daefa Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 1 Dec 2022 21:33:17 +0200
Subject: [PATCH 66/90] Initialize wallet directly from constructor argument
[skip ci]
---
.../settings/other_settings_view_model.dart | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/view_model/settings/other_settings_view_model.dart b/lib/view_model/settings/other_settings_view_model.dart
index b964adc6e..c57af50d9 100644
--- a/lib/view_model/settings/other_settings_view_model.dart
+++ b/lib/view_model/settings/other_settings_view_model.dart
@@ -15,18 +15,17 @@ part 'other_settings_view_model.g.dart';
class OtherSettingsViewModel = OtherSettingsViewModelBase with _$OtherSettingsViewModel;
abstract class OtherSettingsViewModelBase with Store {
- OtherSettingsViewModelBase(
- this._settingsStore, WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo> wallet)
- : walletType = wallet.type,
- _wallet = wallet,
+ OtherSettingsViewModelBase(this._settingsStore, this._wallet)
+ : walletType = _wallet.type,
currentVersion = '' {
- PackageInfo.fromPlatform().then((PackageInfo packageInfo) => currentVersion = packageInfo.version);
+ PackageInfo.fromPlatform()
+ .then((PackageInfo packageInfo) => currentVersion = packageInfo.version);
- final priority = _settingsStore.priority[wallet.type];
- final priorities = priorityForWalletType(wallet.type);
+ final priority = _settingsStore.priority[_wallet.type];
+ final priorities = priorityForWalletType(_wallet.type);
if (!priorities.contains(priority)) {
- _settingsStore.priority[wallet.type] = priorities.first;
+ _settingsStore.priority[_wallet.type] = priorities.first;
}
}
@@ -60,5 +59,6 @@ abstract class OtherSettingsViewModelBase with Store {
return priority.toString();
}
- void onDisplayPrioritySelected(TransactionPriority priority) => _settingsStore.priority[_wallet.type] = priority;
+ void onDisplayPrioritySelected(TransactionPriority priority) =>
+ _settingsStore.priority[_wallet.type] = priority;
}
From dd99508d3e3d894987dc2f5d1616f310c1586fb7 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 1 Dec 2022 22:11:51 +0200
Subject: [PATCH 67/90] Fix static amount value for determining best rate and
replace it with the input the user types
---
lib/view_model/exchange/exchange_view_model.dart | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 725208324..ff3b66f73 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -296,12 +296,14 @@ abstract class ExchangeViewModelBase with Store {
}
Future<void> _calculateBestRate() async {
+ final amount = double.tryParse(depositAmount) ?? double.tryParse(receiveAmount) ?? 1;
+
final result = await Future.wait<double>(
_tradeAvailableProviders
.map((element) => element.calculateAmount(
from: depositCurrency,
to: receiveCurrency,
- amount: 1,
+ amount: amount,
isFixedRateMode: isFixedRateMode,
isReceiveAmount: false))
);
@@ -311,7 +313,7 @@ abstract class ExchangeViewModelBase with Store {
for (int i=0;i<result.length;i++) {
if (result[i] != 0) {
/// add this provider as its valid for this trade
- _sortedAvailableProviders[result[i]] = _tradeAvailableProviders[i];
+ _sortedAvailableProviders[result[i] / amount] = _tradeAvailableProviders[i];
}
}
if (_sortedAvailableProviders.isNotEmpty) {
From 091ac41ee276e8862a12af0b7362513270f88a84 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 1 Dec 2022 22:37:13 +0200
Subject: [PATCH 68/90] allow null minimum amount in limits
---
lib/view_model/exchange/exchange_view_model.dart | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index ff3b66f73..fd66a4254 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -336,7 +336,7 @@ abstract class ExchangeViewModelBase with Store {
? depositCurrency
: receiveCurrency;
- double lowestMin = double.maxFinite;
+ double? lowestMin = double.maxFinite;
double? highestMax = 0.0;
for (var provider in selectedProviders) {
@@ -351,8 +351,8 @@ abstract class ExchangeViewModelBase with Store {
to: to,
isFixedRateMode: isFixedRateMode);
- if (tempLimits.min != null && tempLimits.min! < lowestMin) {
- lowestMin = tempLimits.min!;
+ if (lowestMin != null && (tempLimits.min ?? -1) < lowestMin) {
+ lowestMin = tempLimits.min;
}
if (highestMax != null && (tempLimits.max ?? double.maxFinite) > highestMax) {
highestMax = tempLimits.max;
@@ -362,7 +362,7 @@ abstract class ExchangeViewModelBase with Store {
}
}
- if (lowestMin < double.maxFinite) {
+ if (lowestMin != double.maxFinite) {
limits = Limits(min: lowestMin, max: highestMax);
limitsState = LimitsLoadedSuccessfully(limits: limits);
From 3bcd31ac44d95235bfb03a46497b71919c3ba28e Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Fri, 2 Dec 2022 20:38:16 +0200
Subject: [PATCH 69/90] calculate best rate based on min/max amount
---
lib/view_model/exchange/exchange_view_model.dart | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index fd66a4254..f9d832843 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -296,7 +296,7 @@ abstract class ExchangeViewModelBase with Store {
}
Future<void> _calculateBestRate() async {
- final amount = double.tryParse(depositAmount) ?? double.tryParse(receiveAmount) ?? 1;
+ final amount = limits.min ?? limits.max ?? 1;
final result = await Future.wait<double>(
_tradeAvailableProviders
From 116e468581cf862584a640f41a07d77e0879f4f9 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Fri, 2 Dec 2022 23:20:06 +0200
Subject: [PATCH 70/90] calculate best rate based on deposit/receive amount
---
lib/view_model/exchange/exchange_view_model.dart | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index f9d832843..b03415f4a 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -296,7 +296,7 @@ abstract class ExchangeViewModelBase with Store {
}
Future<void> _calculateBestRate() async {
- final amount = limits.min ?? limits.max ?? 1;
+ final amount = double.tryParse(isFixedRateMode ? receiveAmount : depositAmount) ?? 1;
final result = await Future.wait<double>(
_tradeAvailableProviders
From 5f1e8e9d33fa04bac655e870820620f059ffd4e7 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Fri, 2 Dec 2022 23:36:22 +0200
Subject: [PATCH 71/90] remove isEditable parameter
---
lib/di.dart | 3 +--
lib/router.dart | 5 ++---
lib/src/screens/contact/contact_list_page.dart | 13 ++++++-------
.../contact_list/contact_list_view_model.dart | 8 ++++----
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/lib/di.dart b/lib/di.dart
index b84f98ad9..539681036 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -462,10 +462,9 @@ Future setup(
getIt.registerFactory(
() => ContactListViewModel(_contactSource, _walletInfoSource));
- getIt.registerFactoryParam<ContactListPage, bool, CryptoCurrency?>((bool isEditable, CryptoCurrency? cur)
+ getIt.registerFactoryParam<ContactListPage, CryptoCurrency?, void>((CryptoCurrency? cur, _)
=> ContactListPage(
getIt.get<ContactListViewModel>(),
- isEditable: isEditable,
selectedCurrency: cur));
getIt.registerFactoryParam<ContactPage, ContactRecord?, void>(
diff --git a/lib/router.dart b/lib/router.dart
index 9fe22e22d..07e500544 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -300,13 +300,12 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.addressBook:
return MaterialPageRoute<void>(
builder: (_) =>
- getIt.get<ContactListPage>(param1: true));
+ getIt.get<ContactListPage>());
case Routes.pickerAddressBook:
final selectedCurrency = settings.arguments as CryptoCurrency;
return MaterialPageRoute<void>(
- builder: (_) => getIt.get<ContactListPage>(param1: false,
- param2: selectedCurrency));
+ builder: (_) => getIt.get<ContactListPage>(param1: selectedCurrency));
case Routes.addressBookAddContact:
return CupertinoPageRoute<void>(
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 7895a1df3..8fcaf31a2 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -17,10 +17,9 @@ import 'package:cake_wallet/src/widgets/collapsible_standart_list.dart';
class ContactListPage extends BasePage {
ContactListPage(this.contactListViewModel,
- {this.isEditable = true, required this.selectedCurrency});
+ {this.selectedCurrency});
final ContactListViewModel contactListViewModel;
- final bool isEditable;
final CryptoCurrency? selectedCurrency;
@override
@@ -28,7 +27,7 @@ class ContactListPage extends BasePage {
@override
Widget? trailing(BuildContext context) {
- if (!isEditable) {
+ if (selectedCurrency != null) {
return null;
}
@@ -68,9 +67,9 @@ class ContactListPage extends BasePage {
child: Observer(
builder: (_) {
final contacts =
- contactListViewModel.getContacts(isEditable, selectedCurrency);
+ contactListViewModel.getContacts(selectedCurrency);
final walletContacts =
- contactListViewModel.getWallets(isEditable, selectedCurrency);
+ contactListViewModel.getWallets(selectedCurrency);
return CollapsibleSectionList(
context: context,
sectionCount: 2,
@@ -99,7 +98,7 @@ class ContactListPage extends BasePage {
final contact = contacts[index];
final content = generateRaw(context, contact);
- return !isEditable
+ return selectedCurrency != null
? content
: Slidable(
key: Key('${contact.key}'),
@@ -116,7 +115,7 @@ class ContactListPage extends BasePage {
return GestureDetector(
onTap: () async {
- if (!isEditable) {
+ if (selectedCurrency != null) {
Navigator.of(context).pop(contact);
return;
}
diff --git a/lib/view_model/contact_list/contact_list_view_model.dart b/lib/view_model/contact_list/contact_list_view_model.dart
index 0f67245af..3fa9a73a4 100644
--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@@ -46,16 +46,16 @@ abstract class ContactListViewModelBase with Store {
Future<void> delete(ContactRecord contact) async => contact.original.delete();
- List<ContactRecord> getContacts(bool isEditable, CryptoCurrency? cur) {
- if (!isEditable) {
+ List<ContactRecord> getContacts(CryptoCurrency? cur) {
+ if (cur != null) {
return contacts.where((element) => element.type == cur).toList();
}
return contacts;
}
- List<WalletContact> getWallets(bool isEditable, CryptoCurrency? cur) {
- if (!isEditable) {
+ List<WalletContact> getWallets(CryptoCurrency? cur) {
+ if (cur != null) {
return walletContacts.where((element) => element.type == cur).toList();
}
From 4c7a0a8cb97a4e1af58127bd52e185a3ae60a4e5 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Sat, 3 Dec 2022 00:34:34 +0200
Subject: [PATCH 72/90] rework _getCurrencyImage func
---
.../screens/contact/contact_list_page.dart | 74 ++-----------------
1 file changed, 6 insertions(+), 68 deletions(-)
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 8fcaf31a2..9d0d1ab5a 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -111,7 +111,10 @@ class ContactListPage extends BasePage {
}
Widget generateRaw(BuildContext context, ContactBase contact) {
- final image = _getCurrencyImage(contact.type);
+ final image = contact.type.iconPath;
+ final currencyIcon = image != null ? Image.asset(image, height: 24, width: 24)
+ : const SizedBox(height: 24, width: 24);
+
return GestureDetector(
onTap: () async {
@@ -136,12 +139,10 @@ class ContactListPage extends BasePage {
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
- image ?? Offstage(),
+ currencyIcon,
Expanded(
child: Padding(
- padding: image != null
- ? EdgeInsets.only(left: 12)
- : EdgeInsets.only(left: 0),
+ padding: EdgeInsets.only(left: 12),
child: Text(
contact.name,
style: TextStyle(
@@ -157,69 +158,6 @@ class ContactListPage extends BasePage {
);
}
- Image? _getCurrencyImage(CryptoCurrency currency) {
- Image? image;
-
- switch (currency) {
- case CryptoCurrency.xmr:
- image =
- Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
- break;
- case CryptoCurrency.ada:
- image = Image.asset('assets/images/ada.png', height: 24, width: 24);
- break;
- case CryptoCurrency.bch:
- image = Image.asset('assets/images/bch.png', height: 24, width: 24);
- break;
- case CryptoCurrency.bnb:
- image = Image.asset('assets/images/bnb.png', height: 24, width: 24);
- break;
- case CryptoCurrency.btc:
- image = Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
- break;
- case CryptoCurrency.dai:
- image = Image.asset('assets/images/dai.png', height: 24, width: 24);
- break;
- case CryptoCurrency.dash:
- image = Image.asset('assets/images/dash.png', height: 24, width: 24);
- break;
- case CryptoCurrency.eos:
- image = Image.asset('assets/images/eos.png', height: 24, width: 24);
- break;
- case CryptoCurrency.eth:
- image = Image.asset('assets/images/eth.png', height: 24, width: 24);
- break;
- case CryptoCurrency.ltc:
- image =
- Image.asset('assets/images/litecoin.png', height: 24, width: 24);
- break;
- case CryptoCurrency.nano:
- image = Image.asset('assets/images/nano.png', height: 24, width: 24);
- break;
- case CryptoCurrency.trx:
- image = Image.asset('assets/images/trx.png', height: 24, width: 24);
- break;
- case CryptoCurrency.usdt:
- image = Image.asset('assets/images/usdt.png', height: 24, width: 24);
- break;
- case CryptoCurrency.usdterc20:
- image = Image.asset('assets/images/usdterc.png', height: 24, width: 24);
- break;
- case CryptoCurrency.xlm:
- image = Image.asset('assets/images/xlm.png', height: 24, width: 24);
- break;
- case CryptoCurrency.xrp:
- image = Image.asset('assets/images/xrp.png', height: 24, width: 24);
- break;
- case CryptoCurrency.xhv:
- image = Image.asset('assets/images/haven_logo.png', height: 24, width: 24);
- break;
- default:
- image = null;
- }
- return image;
- }
-
Future<bool> showAlertDialog(BuildContext context) async {
return await showPopUp<bool>(
context: context,
From 11a5e9771197496ac08b72972daf25108c47707b Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sat, 3 Dec 2022 23:34:23 +0200
Subject: [PATCH 73/90] Fix navigation error when state is changed to denied at
app first start [skip_ci]
---
lib/main.dart | 2 +-
lib/reactions/bootstrap.dart | 6 +++---
lib/reactions/on_authentication_state_change.dart | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/main.dart b/lib/main.dart
index e1fade7b4..11eee146b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -261,7 +261,7 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
final statusBarColor = Colors.transparent;
final authenticationStore = getIt.get<AuthenticationStore>();
final initialRoute =
- authenticationStore.state == AuthenticationState.denied
+ authenticationStore.state == AuthenticationState.uninitialized
? Routes.disclaimer
: Routes.login;
final currentTheme = settingsStore.currentTheme;
diff --git a/lib/reactions/bootstrap.dart b/lib/reactions/bootstrap.dart
index 8d9950e64..a40a17088 100644
--- a/lib/reactions/bootstrap.dart
+++ b/lib/reactions/bootstrap.dart
@@ -22,9 +22,9 @@ Future<void> bootstrap(GlobalKey<NavigatorState> navigatorKey) async {
final currentWalletName = getIt
.get<SharedPreferences>()
.getString(PreferencesKey.currentWalletName);
- authenticationStore.state = currentWalletName == null
- ? AuthenticationState.denied
- : AuthenticationState.installed;
+ if (currentWalletName != null) {
+ authenticationStore.state = AuthenticationState.installed;
+ }
startAuthenticationStateChange(authenticationStore, navigatorKey);
startCurrentWalletChangeReaction(
diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
index 560326cb5..c91f5277e 100644
--- a/lib/reactions/on_authentication_state_change.dart
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -23,12 +23,12 @@ void startAuthenticationStateChange(AuthenticationStore authenticationStore,
}
if (state == AuthenticationState.allowed) {
- await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
+ await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
return;
}
if (state == AuthenticationState.denied) {
- await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
+ await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
return;
}
});
From 98da1c221d2bd5f9162c950406e64b22366d10e6 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sat, 3 Dec 2022 23:36:27 +0200
Subject: [PATCH 74/90] revert nullability change with navigation in
authentication state change [skip_ci]
---
lib/reactions/on_authentication_state_change.dart | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
index 560326cb5..c91f5277e 100644
--- a/lib/reactions/on_authentication_state_change.dart
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -23,12 +23,12 @@ void startAuthenticationStateChange(AuthenticationStore authenticationStore,
}
if (state == AuthenticationState.allowed) {
- await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
+ await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
return;
}
if (state == AuthenticationState.denied) {
- await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
+ await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
return;
}
});
From 9d64789983dac6b90f3a5a1aa228ebf181fbc0a7 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sun, 4 Dec 2022 05:08:42 +0200
Subject: [PATCH 75/90] Fix Conflict with main Rename classes to advanced
privacy settings to avoid confusion between settings/privacy-settings
---
lib/di.dart | 6 +--
lib/router.dart | 11 ++--
.../advanced_privacy_settings_page.dart | 9 ++--
.../screens/new_wallet/new_wallet_page.dart | 2 +-
.../advanced_privacy_settings_view_model.dart | 51 ++++++++++++++++++
.../privacy_settings_view_model.dart | 54 -------------------
res/values/strings_de.arb | 3 +-
res/values/strings_en.arb | 3 +-
res/values/strings_es.arb | 3 +-
res/values/strings_fr.arb | 3 +-
res/values/strings_hi.arb | 3 +-
res/values/strings_hr.arb | 3 +-
res/values/strings_it.arb | 3 +-
res/values/strings_ja.arb | 3 +-
res/values/strings_ko.arb | 3 +-
res/values/strings_nl.arb | 3 +-
res/values/strings_pl.arb | 3 +-
res/values/strings_pt.arb | 3 +-
res/values/strings_ru.arb | 3 +-
res/values/strings_uk.arb | 3 +-
res/values/strings_zh.arb | 3 +-
21 files changed, 96 insertions(+), 82 deletions(-)
create mode 100644 lib/view_model/advanced_privacy_settings_view_model.dart
delete mode 100644 lib/view_model/privacy_settings_view_model.dart
diff --git a/lib/di.dart b/lib/di.dart
index a896bf1e4..7a7621203 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -35,7 +35,7 @@ import 'package:cake_wallet/view_model/settings/display_settings_view_model.dart
import 'package:cake_wallet/view_model/settings/other_settings_view_model.dart';
import 'package:cake_wallet/view_model/settings/privacy_settings_view_model.dart';
import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
-import 'package:cake_wallet/view_model/privacy_settings_view_model.dart'
+import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
import 'package:cw_core/unspent_coins_info.dart';
import 'package:cake_wallet/core/backup_service.dart';
import 'package:cw_core/wallet_service.dart';
@@ -816,8 +816,8 @@ Future setup(
(IoniaAnyPayPaymentInfo paymentInfo, AnyPayPaymentCommittedInfo committedInfo)
=> IoniaPaymentStatusPage(getIt.get<IoniaPaymentStatusViewModel>(param1: paymentInfo, param2: committedInfo)));
- getIt.registerFactoryParam<PrivacySettingsViewModel, WalletType, void>((type, _) =>
- PrivacySettingsViewModel(type))
+ getIt.registerFactoryParam<AdvancedPrivacySettingsViewModel, WalletType, void>((type, _) =>
+ AdvancedPrivacySettingsViewModel(type, getIt.get<SettingsStore>()));
_isSetupFinished = true;
}
diff --git a/lib/router.dart b/lib/router.dart
index f22fd3e18..20e4d7632 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -27,7 +27,7 @@ import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
-import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
+import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/routes.dart';
@@ -494,13 +494,14 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.onramperPage:
return CupertinoPageRoute<void>(builder: (_) => getIt.get<OnRamperPage>());
- case Routes.privacySettings:
+ case Routes.advancedPrivacySettings:
final type = settings.arguments as WalletType;
- final privacySettingsViewModel = getIt.get<PrivacySettingsViewModel>(param1: type);
- final nodeCreateViewModel = getIt.get<NodeCreateOrEditViewModel>(param1: type);
return CupertinoPageRoute<void>(
- builder: (_) => AdvancedPrivacySettingsPage(privacySettingsViewModel, nodeCreateViewModel));
+ builder: (_) => AdvancedPrivacySettingsPage(
+ getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
+ getIt.get<NodeCreateOrEditViewModel>(param1: type),
+ ));
default:
return MaterialPageRoute<void>(
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index da67d4511..33aca0307 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -1,7 +1,7 @@
import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
-import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
+import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/generated/i18n.dart';
@@ -12,7 +12,7 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
class AdvancedPrivacySettingsPage extends BasePage {
AdvancedPrivacySettingsPage(this.privacySettingsViewModel, this.nodeViewModel);
- final PrivacySettingsViewModel privacySettingsViewModel;
+ final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
final NodeCreateOrEditViewModel nodeViewModel;
@override
@@ -27,7 +27,7 @@ class AdvancedPrivacySettingsBody extends StatefulWidget {
const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key? key})
: super(key: key);
- final PrivacySettingsViewModel privacySettingsViewModel;
+ final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
final NodeCreateOrEditViewModel nodeViewModel;
@override
@@ -39,7 +39,7 @@ class _AdvancedPrivacySettingsBodyState
extends State<AdvancedPrivacySettingsBody> {
_AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel, this.nodeViewModel);
- final PrivacySettingsViewModel privacySettingsViewModel;
+ final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
final NodeCreateOrEditViewModel nodeViewModel;
final _formKey = GlobalKey<FormState>();
@@ -84,6 +84,7 @@ class _AdvancedPrivacySettingsBodyState
LoadingPrimaryButton(
onPressed: () {
nodeViewModel.save();
+ Navigator.pop(context);
},
text: S.of(context).continue_text,
color: Theme.of(context).accentTextTheme.bodyText1!.color!,
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 0abeaede2..9e0cd898c 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -219,7 +219,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
GestureDetector(
onTap: () {
Navigator.of(context)
- .pushNamed(Routes.privacySettings, arguments: _walletNewVM.type);
+ .pushNamed(Routes.advancedPrivacySettings, arguments: _walletNewVM.type);
},
child: Text(S.of(context).advanced_privacy_settings),
),
diff --git a/lib/view_model/advanced_privacy_settings_view_model.dart b/lib/view_model/advanced_privacy_settings_view_model.dart
new file mode 100644
index 000000000..ef9ab878f
--- /dev/null
+++ b/lib/view_model/advanced_privacy_settings_view_model.dart
@@ -0,0 +1,51 @@
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+
+part 'advanced_privacy_settings_view_model.g.dart';
+
+class AdvancedPrivacySettingsViewModel = AdvancedPrivacySettingsViewModelBase
+ with _$AdvancedPrivacySettingsViewModel;
+
+abstract class AdvancedPrivacySettingsViewModelBase with Store {
+ AdvancedPrivacySettingsViewModelBase(this.type, this._settingsStore)
+ : _disableFiat = false,
+ _addCustomNode = false {
+ settings = [
+ // TODO: uncomment when Disable Fiat PR is merged
+ // SwitcherListItem(
+ // title: S.current.disable_fiat,
+ // value: () => _disableFiat,
+ // onValueChange: (_, bool value) => _disableFiat = value,
+ // ),
+ SwitcherListItem(
+ title: S.current.disable_exchange,
+ value: () => _settingsStore.disableExchange,
+ onValueChange: (_, bool value) {
+ _settingsStore.disableExchange = value;
+ },
+ ),
+ SwitcherListItem(
+ title: S.current.add_custom_node,
+ value: () => _addCustomNode,
+ onValueChange: (_, bool value) => _addCustomNode = value,
+ ),
+ ];
+ }
+
+ late List<SwitcherListItem> settings;
+
+ @observable
+ bool _disableFiat = false;
+
+ @observable
+ bool _addCustomNode = false;
+
+ final WalletType type;
+ final SettingsStore _settingsStore;
+
+ @computed
+ bool get addCustomNode => _addCustomNode;
+}
diff --git a/lib/view_model/privacy_settings_view_model.dart b/lib/view_model/privacy_settings_view_model.dart
deleted file mode 100644
index 760c577ef..000000000
--- a/lib/view_model/privacy_settings_view_model.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'privacy_settings_view_model.g.dart';
-
-class PrivacySettingsViewModel = PrivacySettingsViewModelBase
- with _$PrivacySettingsViewModel;
-
-abstract class PrivacySettingsViewModelBase with Store {
- PrivacySettingsViewModelBase(this.type)
- : _disableFiat = false,
- _disableExchange = false,
- _addCustomNode = false {
- settings = [
- SwitcherListItem(
- // TODO: replace when Disable Fiat PR is merged
- title: "Disable Fiat API",
- // title: S.current.disable_fiat,
- value: () => _disableFiat,
- onValueChange: (_, bool value) => _disableFiat = value,
- ),
- SwitcherListItem(
- title: "Disable Exchange",
- // title: S.current.disable_exchange,
- value: () => _disableExchange,
- onValueChange: (_, bool value) => _disableExchange = value,
- ),
- SwitcherListItem(
- title: "Add New Custom Node",
- // title: S.current.add_custom_node,
- value: () => _addCustomNode,
- onValueChange: (_, bool value) => _addCustomNode = value,
- ),
- ];
- }
-
- late List<SwitcherListItem> settings;
-
- @observable
- bool _disableFiat = false;
-
- @observable
- bool _disableExchange = false;
-
- @observable
- bool _addCustomNode = false;
-
- final WalletType type;
-
- @computed
- bool get addCustomNode => _addCustomNode;
-}
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 8f339d090..d9eb8d78a 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -663,5 +663,6 @@
"other_settings": "Andere Einstellungen",
"disable_exchange": "Exchange deaktivieren",
"advanced_privacy_settings": "Erweiterte Datenschutzeinstellungen",
- "settings_can_be_changed_later": "Diese Einstellungen können später in den App-Einstellungen geändert werden"
+ "settings_can_be_changed_later": "Diese Einstellungen können später in den App-Einstellungen geändert werden",
+ "add_custom_node": "Neuen benutzerdefinierten Knoten hinzufügen"
}
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index b50ba6c83..baf955fcd 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -663,5 +663,6 @@
"other_settings": "Other settings",
"disable_exchange": "Disable exchange",
"advanced_privacy_settings": "Advanced Privacy Settings",
- "settings_can_be_changed_later": "These settings can be changed later in the app settings"
+ "settings_can_be_changed_later": "These settings can be changed later in the app settings",
+ "add_custom_node": "Add New Custom Node"
}
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 738e64849..54b3fae18 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -663,5 +663,6 @@
"other_settings": "Otras configuraciones",
"disable_exchange": "Deshabilitar intercambio",
"advanced_privacy_settings": "Configuración avanzada de privacidad",
- "settings_can_be_changed_later": "Estas configuraciones se pueden cambiar más tarde en la configuración de la aplicación"
+ "settings_can_be_changed_later": "Estas configuraciones se pueden cambiar más tarde en la configuración de la aplicación",
+ "add_custom_node": "Agregar nuevo nodo personalizado"
}
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index f04a6181c..b6836ab18 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -661,5 +661,6 @@
"other_settings": "Autres paramètres",
"disable_exchange": "Désactiver l'échange",
"advanced_privacy_settings": "Paramètres de confidentialité avancés",
- "settings_can_be_changed_later": "Ces paramètres peuvent être modifiés ultérieurement dans les paramètres de l'application"
+ "settings_can_be_changed_later": "Ces paramètres peuvent être modifiés ultérieurement dans les paramètres de l'application",
+ "add_custom_node": "Ajouter un nouveau nœud personnalisé"
}
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index fdf565a7b..72a21f333 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -663,5 +663,6 @@
"other_settings": "अन्य सेटिंग्स",
"disable_exchange": "एक्सचेंज अक्षम करें",
"advanced_privacy_settings": "उन्नत गोपनीयता सेटिंग्स",
- "settings_can_be_changed_later": "इन सेटिंग्स को बाद में ऐप सेटिंग में बदला जा सकता है"
+ "settings_can_be_changed_later": "इन सेटिंग्स को बाद में ऐप सेटिंग में बदला जा सकता है",
+ "add_custom_node": "नया कस्टम नोड जोड़ें"
}
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index ece52e656..16b388a05 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -663,5 +663,6 @@
"other_settings": "Ostale postavke",
"disable_exchange": "Onemogući exchange",
"advanced_privacy_settings": "Napredne postavke privatnosti",
- "settings_can_be_changed_later": "Te se postavke mogu promijeniti kasnije u postavkama aplikacije"
+ "settings_can_be_changed_later": "Te se postavke mogu promijeniti kasnije u postavkama aplikacije",
+ "add_custom_node": "Dodaj novi prilagođeni čvor"
}
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index d5f591c64..28ad40d47 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -663,5 +663,6 @@
"other_settings": "Altre impostazioni",
"disable_exchange": "Disabilita scambio",
"advanced_privacy_settings": "Impostazioni avanzate sulla privacy",
- "settings_can_be_changed_later": "Queste impostazioni possono essere modificate in seguito nelle impostazioni dell'app"
+ "settings_can_be_changed_later": "Queste impostazioni possono essere modificate in seguito nelle impostazioni dell'app",
+ "add_custom_node": "Aggiungi nuovo nodo personalizzato"
}
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 21c21c7a8..d79f58e7a 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -663,5 +663,6 @@
"other_settings": "その他の設定",
"disable_exchange": "交換を無効にする",
"advanced_privacy_settings": "高度なプライバシー設定",
- "settings_can_be_changed_later": "これらの設定は、後でアプリの設定で変更できます"
+ "settings_can_be_changed_later": "これらの設定は、後でアプリの設定で変更できます",
+ "add_custom_node": "新しいカスタム ノードを追加"
}
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 0d2bc31bc..0652ffc54 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -663,5 +663,6 @@
"other_settings": "기타 설정",
"disable_exchange": "교환 비활성화",
"advanced_privacy_settings": "고급 개인 정보 설정",
- "settings_can_be_changed_later": "이 설정은 나중에 앱 설정에서 변경할 수 있습니다."
+ "settings_can_be_changed_later": "이 설정은 나중에 앱 설정에서 변경할 수 있습니다.",
+ "add_custom_node": "새 사용자 정의 노드 추가"
}
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index b7bb86d9c..2c6e528ca 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -663,5 +663,6 @@
"other_settings": "Andere instellingen",
"disable_exchange": "Uitwisseling uitschakelen",
"advanced_privacy_settings": "Geavanceerde privacy-instellingen",
- "settings_can_be_changed_later": "Deze instellingen kunnen later worden gewijzigd in de app-instellingen"
+ "settings_can_be_changed_later": "Deze instellingen kunnen later worden gewijzigd in de app-instellingen",
+ "add_custom_node": "Voeg een nieuw aangepast knooppunt toe"
}
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 20a0b2f98..179f7267b 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -663,5 +663,6 @@
"other_settings": "Inne ustawienia",
"disable_exchange": "Wyłącz wymianę",
"advanced_privacy_settings": "Zaawansowane ustawienia prywatności",
- "settings_can_be_changed_later": "Te ustawienia można później zmienić w ustawieniach aplikacji"
+ "settings_can_be_changed_later": "Te ustawienia można później zmienić w ustawieniach aplikacji",
+ "add_custom_node": "Dodaj nowy węzeł niestandardowy"
}
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 65438a26c..cf0669585 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -662,5 +662,6 @@
"other_settings": "Outras configurações",
"disable_exchange": "Desativar troca",
"advanced_privacy_settings": "Configurações de privacidade avançadas",
- "settings_can_be_changed_later": "Essas configurações podem ser alteradas posteriormente nas configurações do aplicativo"
+ "settings_can_be_changed_later": "Essas configurações podem ser alteradas posteriormente nas configurações do aplicativo",
+ "add_custom_node": "Adicionar novo nó personalizado"
}
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 4dcda3007..f73ad4564 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -663,5 +663,6 @@
"other_settings": "Другие настройки",
"disable_exchange": "Отключить обмен",
"advanced_privacy_settings": "Расширенные настройки конфиденциальности",
- "settings_can_be_changed_later": "Эти настройки можно изменить позже в настройках приложения."
+ "settings_can_be_changed_later": "Эти настройки можно изменить позже в настройках приложения.",
+ "add_custom_node": "Добавить новый пользовательский узел"
}
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 61f6cfb0d..c52359d64 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -662,5 +662,6 @@
"other_settings": "Інші налаштування",
"disable_exchange": "Вимкнути exchange",
"advanced_privacy_settings": "Розширені налаштування конфіденційності",
- "settings_can_be_changed_later": "Ці параметри можна змінити пізніше в налаштуваннях програми"
+ "settings_can_be_changed_later": "Ці параметри можна змінити пізніше в налаштуваннях програми",
+ "add_custom_node": "Додати новий спеціальний вузол"
}
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 750b4e605..a8f9119da 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -661,5 +661,6 @@
"other_settings": "其他设置",
"disable_exchange": "禁用交换",
"advanced_privacy_settings": "高级隐私设置",
- "settings_can_be_changed_later": "稍后可以在应用设置中更改这些设置"
+ "settings_can_be_changed_later": "稍后可以在应用设置中更改这些设置",
+ "add_custom_node": "添加新的自定义节点"
}
From 7e6439947645fc197d74127d0c593161dcfffe8d Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sun, 4 Dec 2022 05:27:49 +0200
Subject: [PATCH 76/90] remove un-necessary attributes passing
---
.../advanced_privacy_settings_page.dart | 22 +++++++------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index 33aca0307..e0dd1a729 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -31,16 +31,11 @@ class AdvancedPrivacySettingsBody extends StatefulWidget {
final NodeCreateOrEditViewModel nodeViewModel;
@override
- _AdvancedPrivacySettingsBodyState createState() =>
- _AdvancedPrivacySettingsBodyState(privacySettingsViewModel, nodeViewModel);
+ _AdvancedPrivacySettingsBodyState createState() => _AdvancedPrivacySettingsBodyState();
}
-class _AdvancedPrivacySettingsBodyState
- extends State<AdvancedPrivacySettingsBody> {
- _AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel, this.nodeViewModel);
-
- final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
- final NodeCreateOrEditViewModel nodeViewModel;
+class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBody> {
+ _AdvancedPrivacySettingsBodyState();
final _formKey = GlobalKey<FormState>();
@@ -53,7 +48,7 @@ class _AdvancedPrivacySettingsBodyState
content: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
- ...privacySettingsViewModel.settings.map(
+ ...widget.privacySettingsViewModel.settings.map(
(item) => Observer(
builder: (_) => SettingsSwitcherCell(
title: item.title,
@@ -64,12 +59,12 @@ class _AdvancedPrivacySettingsBodyState
),
Observer(
builder: (_) {
- if (privacySettingsViewModel.addCustomNode) {
+ if (widget.privacySettingsViewModel.addCustomNode) {
return Padding(
padding: EdgeInsets.only(left: 24, right: 24, top: 24),
child: NodeForm(
formKey: _formKey,
- nodeViewModel: nodeViewModel,
+ nodeViewModel: widget.nodeViewModel,
),
);
}
@@ -83,7 +78,7 @@ class _AdvancedPrivacySettingsBodyState
children: [
LoadingPrimaryButton(
onPressed: () {
- nodeViewModel.save();
+ widget.nodeViewModel.save();
Navigator.pop(context);
},
text: S.of(context).continue_text,
@@ -92,8 +87,7 @@ class _AdvancedPrivacySettingsBodyState
),
const SizedBox(height: 25),
Padding(
- padding: EdgeInsets.symmetric(
- horizontal: MediaQuery.of(context).size.width * 0.15),
+ padding: EdgeInsets.symmetric(horizontal: MediaQuery.of(context).size.width * 0.15),
child: Text(
S.of(context).settings_can_be_changed_later,
textAlign: TextAlign.center,
From 9eb8a442d813ece2f9f73b11142afc30faf96721 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sun, 4 Dec 2022 17:30:09 +0200
Subject: [PATCH 77/90] Allow setting the new added node as the current
selected node
---
lib/di.dart | 7 +++++--
.../new_wallet/advanced_privacy_settings_page.dart | 8 ++++----
.../node_list/node_create_or_edit_view_model.dart | 11 +++++++++--
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/lib/di.dart b/lib/di.dart
index 7a7621203..a5c7702d8 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -500,8 +500,11 @@ Future setup(
getIt.registerFactory(() => OtherSettingsPage(getIt.get<OtherSettingsViewModel>()));
getIt.registerFactoryParam<NodeCreateOrEditViewModel, WalletType?, void>(
- (WalletType? type, _) =>
- NodeCreateOrEditViewModel(_nodeSource, type ?? getIt.get<AppStore>().wallet!.type));
+ (WalletType? type, _) => NodeCreateOrEditViewModel(
+ _nodeSource,
+ type ?? getIt.get<AppStore>().wallet!.type,
+ getIt.get<SettingsStore>(),
+ ));
getIt.registerFactory(
() => NodeCreateOrEditPage(getIt.get<NodeCreateOrEditViewModel>()));
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index e0dd1a729..ff1c83f90 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -10,9 +10,9 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
class AdvancedPrivacySettingsPage extends BasePage {
- AdvancedPrivacySettingsPage(this.privacySettingsViewModel, this.nodeViewModel);
+ AdvancedPrivacySettingsPage(this.advancedPrivacySettingsViewModel, this.nodeViewModel);
- final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
+ final AdvancedPrivacySettingsViewModel advancedPrivacySettingsViewModel;
final NodeCreateOrEditViewModel nodeViewModel;
@override
@@ -20,7 +20,7 @@ class AdvancedPrivacySettingsPage extends BasePage {
@override
Widget body(BuildContext context) =>
- AdvancedPrivacySettingsBody(privacySettingsViewModel, nodeViewModel);
+ AdvancedPrivacySettingsBody(advancedPrivacySettingsViewModel, nodeViewModel);
}
class AdvancedPrivacySettingsBody extends StatefulWidget {
@@ -78,7 +78,7 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
children: [
LoadingPrimaryButton(
onPressed: () {
- widget.nodeViewModel.save();
+ widget.nodeViewModel.save(saveAsCurrent: true);
Navigator.pop(context);
},
text: S.of(context).continue_text,
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index befb38d27..a8f184589 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,4 +1,5 @@
import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/store/settings_store.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
import 'package:cw_core/node.dart';
@@ -10,7 +11,7 @@ class NodeCreateOrEditViewModel = NodeCreateOrEditViewModelBase
with _$NodeCreateOrEditViewModel;
abstract class NodeCreateOrEditViewModelBase with Store {
- NodeCreateOrEditViewModelBase(this._nodeSource, this._walletType)
+ NodeCreateOrEditViewModelBase(this._nodeSource, this._walletType, this._settingsStore)
: state = InitialExecutionState(),
connectionState = InitialExecutionState(),
useSSL = false,
@@ -63,6 +64,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
final WalletType _walletType;
final Box<Node> _nodeSource;
+ final SettingsStore _settingsStore;
@action
void reset() {
@@ -75,13 +77,18 @@ abstract class NodeCreateOrEditViewModelBase with Store {
}
@action
- Future<void> save() async {
+ Future<void> save({bool saveAsCurrent = false}) async {
try {
state = IsExecutingState();
final node =
Node(uri: uri, type: _walletType, login: login, password: password,
useSSL: useSSL, trusted: trusted);
await _nodeSource.add(node);
+
+ if (saveAsCurrent) {
+ _settingsStore.nodes[_walletType] = node;
+ }
+
state = ExecutedSuccessfullyState();
} catch (e) {
state = FailureState(e.toString());
From 3aa0e626ff2e1936bed9d9bbdb248d867d68e035 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Mon, 5 Dec 2022 18:37:35 +0200
Subject: [PATCH 78/90] Pass selected currency to the view model instead of the
UI
---
lib/di.dart | 8 ++--
.../screens/contact/contact_list_page.dart | 23 +++++------
.../contact_list/contact_list_view_model.dart | 39 ++++++++-----------
3 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/lib/di.dart b/lib/di.dart
index 539681036..c37f4eeac 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -459,13 +459,11 @@ Future setup(
(ContactRecord? contact, _) =>
ContactViewModel(_contactSource, contact: contact));
- getIt.registerFactory(
- () => ContactListViewModel(_contactSource, _walletInfoSource));
+ getIt.registerFactoryParam<ContactListViewModel, CryptoCurrency?, void>(
+ (CryptoCurrency? cur, _) => ContactListViewModel(_contactSource, _walletInfoSource, cur));
getIt.registerFactoryParam<ContactListPage, CryptoCurrency?, void>((CryptoCurrency? cur, _)
- => ContactListPage(
- getIt.get<ContactListViewModel>(),
- selectedCurrency: cur));
+ => ContactListPage(getIt.get<ContactListViewModel>(param1: cur)));
getIt.registerFactoryParam<ContactPage, ContactRecord?, void>(
(ContactRecord? contact, _) =>
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 9d0d1ab5a..7cd7a0157 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -9,25 +9,22 @@ import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cw_core/crypto_currency.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
import 'package:cake_wallet/src/widgets/collapsible_standart_list.dart';
class ContactListPage extends BasePage {
- ContactListPage(this.contactListViewModel,
- {this.selectedCurrency});
+ ContactListPage(this.contactListViewModel);
final ContactListViewModel contactListViewModel;
- final CryptoCurrency? selectedCurrency;
@override
String get title => S.current.address_book;
@override
Widget? trailing(BuildContext context) {
- if (selectedCurrency != null) {
+ if (!contactListViewModel.isEditable) {
return null;
}
@@ -66,10 +63,8 @@ class ContactListPage extends BasePage {
padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
child: Observer(
builder: (_) {
- final contacts =
- contactListViewModel.getContacts(selectedCurrency);
- final walletContacts =
- contactListViewModel.getWallets(selectedCurrency);
+ final contacts = contactListViewModel.contactsToShow;
+ final walletContacts = contactListViewModel.walletContactsToShow;
return CollapsibleSectionList(
context: context,
sectionCount: 2,
@@ -98,13 +93,13 @@ class ContactListPage extends BasePage {
final contact = contacts[index];
final content = generateRaw(context, contact);
- return selectedCurrency != null
- ? content
- : Slidable(
+ return contactListViewModel.isEditable
+ ? Slidable(
key: Key('${contact.key}'),
endActionPane: _actionPane(context, contact),
child: content,
- );
+ )
+ : content;
},
);})
);
@@ -118,7 +113,7 @@ class ContactListPage extends BasePage {
return GestureDetector(
onTap: () async {
- if (selectedCurrency != null) {
+ if (!contactListViewModel.isEditable) {
Navigator.of(context).pop(contact);
return;
}
diff --git a/lib/view_model/contact_list/contact_list_view_model.dart b/lib/view_model/contact_list/contact_list_view_model.dart
index 3fa9a73a4..5b0187fc8 100644
--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@@ -11,24 +11,22 @@ import 'package:cw_core/crypto_currency.dart';
part 'contact_list_view_model.g.dart';
-class ContactListViewModel = ContactListViewModelBase
- with _$ContactListViewModel;
+class ContactListViewModel = ContactListViewModelBase with _$ContactListViewModel;
abstract class ContactListViewModelBase with Store {
- ContactListViewModelBase(this.contactSource, this.walletInfoSource)
+ ContactListViewModelBase(this.contactSource, this.walletInfoSource, this._currency)
: contacts = ObservableList<ContactRecord>(),
walletContacts = [] {
walletInfoSource.values.forEach((info) {
if (info.addresses?.isNotEmpty ?? false) {
info.addresses?.forEach((address, label) {
- final name = label.isNotEmpty
- ? info.name + ' ($label)'
- : info.name;
+ final name = label.isNotEmpty ? info.name + ' ($label)' : info.name;
walletContacts.add(WalletContact(
- address,
- name,
- walletTypeToCryptoCurrency(info.type)));
+ address,
+ name,
+ walletTypeToCryptoCurrency(info.type),
+ ));
});
}
});
@@ -42,23 +40,18 @@ abstract class ContactListViewModelBase with Store {
final Box<WalletInfo> walletInfoSource;
final ObservableList<ContactRecord> contacts;
final List<WalletContact> walletContacts;
+ final CryptoCurrency? _currency;
StreamSubscription<BoxEvent>? _subscription;
+ bool get isEditable => _currency == null;
+
Future<void> delete(ContactRecord contact) async => contact.original.delete();
- List<ContactRecord> getContacts(CryptoCurrency? cur) {
- if (cur != null) {
- return contacts.where((element) => element.type == cur).toList();
- }
+ @computed
+ List<ContactRecord> get contactsToShow =>
+ contacts.where((element) => _currency == null || element.type == _currency).toList();
- return contacts;
- }
-
- List<WalletContact> getWallets(CryptoCurrency? cur) {
- if (cur != null) {
- return walletContacts.where((element) => element.type == cur).toList();
- }
-
- return walletContacts;
- }
+ @computed
+ List<WalletContact> get walletContactsToShow =>
+ walletContacts.where((element) => _currency == null || element.type == _currency).toList();
}
From d19f7b6d3896e39cd906c08bd7eb4358df661f70 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Mon, 5 Dec 2022 18:40:53 +0200
Subject: [PATCH 79/90] Remove unused state 'denied' from authentication state
[skip ci]
---
lib/reactions/on_authentication_state_change.dart | 5 -----
lib/store/authentication_store.dart | 5 +----
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
index c91f5277e..edadf33b0 100644
--- a/lib/reactions/on_authentication_state_change.dart
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -26,10 +26,5 @@ void startAuthenticationStateChange(AuthenticationStore authenticationStore,
await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
return;
}
-
- if (state == AuthenticationState.denied) {
- await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
- return;
- }
});
}
diff --git a/lib/store/authentication_store.dart b/lib/store/authentication_store.dart
index 626ca2a91..b734d7acb 100644
--- a/lib/store/authentication_store.dart
+++ b/lib/store/authentication_store.dart
@@ -4,7 +4,7 @@ part 'authentication_store.g.dart';
class AuthenticationStore = AuthenticationStoreBase with _$AuthenticationStore;
-enum AuthenticationState { uninitialized, installed, allowed, denied }
+enum AuthenticationState { uninitialized, installed, allowed }
abstract class AuthenticationStoreBase with Store {
AuthenticationStoreBase() : state = AuthenticationState.uninitialized;
@@ -17,7 +17,4 @@ abstract class AuthenticationStoreBase with Store {
@action
void allowed() => state = AuthenticationState.allowed;
-
- @action
- void denied() => state = AuthenticationState.denied;
}
From 35b7c05bc1650d41b25c3cc67385cd7b5a8caf95 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Tue, 6 Dec 2022 11:41:25 +0200
Subject: [PATCH 80/90] fix null check
---
.../sideshift/sideshift_exchange_provider.dart | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/exchange/sideshift/sideshift_exchange_provider.dart b/lib/exchange/sideshift/sideshift_exchange_provider.dart
index 8cd4593c1..23e506858 100644
--- a/lib/exchange/sideshift/sideshift_exchange_provider.dart
+++ b/lib/exchange/sideshift/sideshift_exchange_provider.dart
@@ -249,12 +249,14 @@ class SideShiftExchangeProvider extends ExchangeProvider {
final expectedSendAmount = responseJSON['depositAmount'].toString();
final deposits = responseJSON['deposits'] as List?;
TradeState? state;
-
- if (deposits != null && deposits.isEmpty) {
- state = TradeState.deserialize(raw: 'created');
- } else {
- final status = deposits?[0]['status'] as String;
- state = TradeState.deserialize(raw: status);
+
+ if (deposits != null) {
+ if (deposits.isEmpty) {
+ state = TradeState.deserialize(raw: 'created');
+ } else {
+ final status = deposits[0]['status'] as String;
+ state = TradeState.deserialize(raw: status);
+ }
}
final expiredAtRaw = responseJSON['expiresAtISO'] as String;
From 36c27026881c4bbbd957fd65cfbfb64a9c76d301 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 6 Dec 2022 13:30:11 +0200
Subject: [PATCH 81/90] - Recalculate best rate if isFixedRate changed - check
limits against the receive amount if isFixedRate
---
.../exchange/exchange_view_model.dart | 27 +++++++++----------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index b19434166..cda65527a 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -44,7 +44,6 @@ abstract class ExchangeViewModelBase with Store {
ExchangeViewModelBase(this.wallet, this.trades, this._exchangeTemplateStore,
this.tradesStore, this._settingsStore, this.sharedPreferences)
: _cryptoNumberFormat = NumberFormat(),
- isReverse = false,
isFixedRateMode = false,
isReceiveAmountEntered = false,
depositAmount = '',
@@ -112,7 +111,11 @@ abstract class ExchangeViewModelBase with Store {
loadLimits();
reaction(
(_) => isFixedRateMode,
- (Object _) => loadLimits());
+ (Object _) {
+ loadLimits();
+ _bestRate = 0;
+ _calculateBestRate();
+ });
}
final WalletBase wallet;
@@ -227,8 +230,6 @@ abstract class ExchangeViewModelBase with Store {
Limits limits;
- bool isReverse;
-
NumberFormat _cryptoNumberFormat;
final SettingsStore _settingsStore;
@@ -258,7 +259,6 @@ abstract class ExchangeViewModelBase with Store {
@action
Future<void> changeReceiveAmount({required String amount}) async {
receiveAmount = amount;
- isReverse = true;
if (amount.isEmpty) {
depositAmount = '';
@@ -283,7 +283,6 @@ abstract class ExchangeViewModelBase with Store {
@action
Future<void> changeDepositAmount({required String amount}) async {
depositAmount = amount;
- isReverse = false;
if (amount.isEmpty) {
depositAmount = '';
@@ -307,7 +306,7 @@ abstract class ExchangeViewModelBase with Store {
}
Future<void> _calculateBestRate() async {
- final amount = double.tryParse(isFixedRateMode ? receiveAmount : depositAmount) ?? 1;
+ final amount = double.tryParse(depositAmount) ?? 1;
final result = await Future.wait<double>(
_tradeAvailableProviders
@@ -401,7 +400,7 @@ abstract class ExchangeViewModelBase with Store {
settleAddress: receiveAddress,
refundAddress: depositAddress,
);
- amount = depositAmount;
+ amount = isFixedRateMode ? receiveAmount : depositAmount;
}
if (provider is SimpleSwapExchangeProvider) {
@@ -412,7 +411,7 @@ abstract class ExchangeViewModelBase with Store {
address: receiveAddress,
refundAddress: depositAddress,
);
- amount = depositAmount;
+ amount = isFixedRateMode ? receiveAmount : depositAmount;
}
if (provider is XMRTOExchangeProvider) {
@@ -424,7 +423,7 @@ abstract class ExchangeViewModelBase with Store {
address: receiveAddress,
refundAddress: depositAddress,
isBTCRequest: isReceiveAmountEntered);
- amount = depositAmount;
+ amount = isFixedRateMode ? receiveAmount : depositAmount;
}
if (provider is ChangeNowExchangeProvider) {
@@ -435,8 +434,8 @@ abstract class ExchangeViewModelBase with Store {
toAmount: receiveAmount.replaceAll(',', '.'),
refundAddress: depositAddress,
address: receiveAddress,
- isReverse: isReverse);
- amount = isReverse ? receiveAmount : depositAmount;
+ isReverse: isFixedRateMode);
+ amount = isFixedRateMode ? receiveAmount : depositAmount;
}
if (provider is MorphTokenExchangeProvider) {
@@ -446,13 +445,13 @@ abstract class ExchangeViewModelBase with Store {
amount: depositAmount.replaceAll(',', '.'),
refundAddress: depositAddress,
address: receiveAddress);
- amount = depositAmount;
+ amount = isFixedRateMode ? receiveAmount : depositAmount;
}
amount = amount.replaceAll(',', '.');
if (limitsState is LimitsLoadedSuccessfully) {
- if (double.parse(amount) < limits.min!) {
+ if (limits.max != null && double.parse(amount) < limits.min!) {
continue;
} else if (limits.max != null && double.parse(amount) > limits.max!) {
continue;
From 8514887da6f48262b8f5ab6aed254167bf43502b Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 6 Dec 2022 15:40:40 +0200
Subject: [PATCH 82/90] Negate is Fixed rate mode in simpleswap
---
.../simpleswap/simpleswap_exchange_provider.dart | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
index c6e1baeea..0fb799cec 100644
--- a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
+++ b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
@@ -20,8 +20,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
.where((i) => i != CryptoCurrency.zaddr)
.map((i) => CryptoCurrency.all
.where((i) => i != CryptoCurrency.zaddr)
- .map((k) => ExchangePair(from: i, to: k, reverse: true))
- .where((c) => c != null))
+ .map((k) => ExchangePair(from: i, to: k, reverse: true)))
.expand((i) => i)
.toList());
@@ -54,12 +53,12 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
'currency_from': fromCurrency,
'currency_to': toCurrency,
'amount': amount.toString(),
- 'fixed': isFixedRateMode.toString()
+ 'fixed': (!isFixedRateMode).toString()
};
final uri = Uri.https(apiAuthority, getEstimatePath, params);
final response = await get(uri);
- if (response.body == null || response.body == "null") return 0.00;
+ if (response.body == "null") return 0.00;
final data = json.decode(response.body) as String;
return double.parse(data);
} catch (_) {
@@ -87,7 +86,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
"currency_from": _normalizeCryptoCurrency(_request.from),
"currency_to": _normalizeCryptoCurrency(_request.to),
"amount": _request.amount,
- "fixed": isFixedRateMode,
+ "fixed": !isFixedRateMode,
"user_refund_address": _request.refundAddress,
"address_to": _request.address
};
From f29f17476c0faf16dfc169067841c9b937511d66 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Tue, 6 Dec 2022 17:14:07 +0200
Subject: [PATCH 83/90] add null check [skip ci]
---
.../sideshift/sideshift_exchange_provider.dart | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/lib/exchange/sideshift/sideshift_exchange_provider.dart b/lib/exchange/sideshift/sideshift_exchange_provider.dart
index 23e506858..0cd74061f 100644
--- a/lib/exchange/sideshift/sideshift_exchange_provider.dart
+++ b/lib/exchange/sideshift/sideshift_exchange_provider.dart
@@ -249,15 +249,12 @@ class SideShiftExchangeProvider extends ExchangeProvider {
final expectedSendAmount = responseJSON['depositAmount'].toString();
final deposits = responseJSON['deposits'] as List?;
TradeState? state;
-
- if (deposits != null) {
- if (deposits.isEmpty) {
- state = TradeState.deserialize(raw: 'created');
- } else {
- final status = deposits[0]['status'] as String;
- state = TradeState.deserialize(raw: status);
- }
+ String? status;
+
+ if (deposits?.isNotEmpty ?? false) {
+ status = deposits![0]['status'] as String;
}
+ state = TradeState.deserialize(raw: status ?? 'created');
final expiredAtRaw = responseJSON['expiresAtISO'] as String;
final expiredAt =
From fa5c705bc888abea53703ca06589e344a63d7ee8 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Tue, 6 Dec 2022 17:29:44 +0200
Subject: [PATCH 84/90] Add nullability to `status` String [skip ci]
---
lib/exchange/sideshift/sideshift_exchange_provider.dart | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/exchange/sideshift/sideshift_exchange_provider.dart b/lib/exchange/sideshift/sideshift_exchange_provider.dart
index 0cd74061f..920dc9907 100644
--- a/lib/exchange/sideshift/sideshift_exchange_provider.dart
+++ b/lib/exchange/sideshift/sideshift_exchange_provider.dart
@@ -252,7 +252,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
String? status;
if (deposits?.isNotEmpty ?? false) {
- status = deposits![0]['status'] as String;
+ status = deposits![0]['status'] as String?;
}
state = TradeState.deserialize(raw: status ?? 'created');
From f14c01303fa08dd0a8d80571bf61e16ac990da39 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 6 Dec 2022 19:23:46 +0200
Subject: [PATCH 85/90] - Add whether this provide supports fixed rate or not -
Fix Change now fixed rate exchange due to wrong rate id
---
.../changenow_exchange_provider.dart | 20 +++++++++++++------
lib/exchange/exchange_provider.dart | 2 +-
.../morphtoken_exchange_provider.dart | 3 +++
.../sideshift_exchange_provider.dart | 10 +++++-----
.../simpleswap_exchange_provider.dart | 3 +++
.../xmrto/xmrto_exchange_provider.dart | 3 +++
.../exchange/exchange_view_model.dart | 3 ++-
7 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
index 96b6142e6..8ef376370 100644
--- a/lib/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -11,7 +11,6 @@ import 'package:cake_wallet/exchange/trade_request.dart';
import 'package:cake_wallet/exchange/trade_state.dart';
import 'package:cake_wallet/exchange/changenow/changenow_request.dart';
import 'package:cake_wallet/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/exchange/trade_not_created_exeption.dart';
class ChangeNowExchangeProvider extends ExchangeProvider {
ChangeNowExchangeProvider()
@@ -21,8 +20,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
.where((i) => i != CryptoCurrency.xhv)
.map((i) => CryptoCurrency.all
.where((i) => i != CryptoCurrency.xhv)
- .map((k) => ExchangePair(from: i, to: k, reverse: true))
- .where((c) => c != null))
+ .map((k) => ExchangePair(from: i, to: k, reverse: true)))
.expand((i) => i)
.toList());
@@ -43,6 +41,9 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
@override
bool get isEnabled => true;
+ @override
+ bool get supportsFixedRate => true;
+
@override
ExchangeProviderDescription get description =>
ExchangeProviderDescription.changeNow;
@@ -109,6 +110,15 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
};
if (isFixedRateMode) {
+ // since we schedule to calculate the rate every 5 seconds we need to ensure that
+ // we have the latest rate id with the given inputs before creating the trade
+ await calculateAmount(
+ from: _request.to,
+ to: _request.from,
+ amount: double.tryParse(_request.toAmount) ?? 0,
+ isFixedRateMode: true,
+ isReceiveAmount: true,
+ );
body['rateId'] = _lastUsedRateId;
}
@@ -180,9 +190,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
final extraId = responseJSON['payinExtraId'] as String;
final outputTransaction = responseJSON['payoutHash'] as String;
final expiredAtRaw = responseJSON['validUntil'] as String;
- final expiredAt = expiredAtRaw != null
- ? DateTime.parse(expiredAtRaw).toLocal()
- : null;
+ final expiredAt = DateTime.tryParse(expiredAtRaw)?.toLocal();
return Trade(
id: id,
diff --git a/lib/exchange/exchange_provider.dart b/lib/exchange/exchange_provider.dart
index 14fba803f..108256015 100644
--- a/lib/exchange/exchange_provider.dart
+++ b/lib/exchange/exchange_provider.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
import 'package:cw_core/crypto_currency.dart';
import 'package:cake_wallet/exchange/trade_request.dart';
import 'package:cake_wallet/exchange/exchange_pair.dart';
@@ -14,6 +13,7 @@ abstract class ExchangeProvider {
ExchangeProviderDescription get description;
bool get isAvailable;
bool get isEnabled;
+ bool get supportsFixedRate;
@override
String toString() => title;
diff --git a/lib/exchange/morphtoken/morphtoken_exchange_provider.dart b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
index 1df4fef87..6650d4f3a 100644
--- a/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
+++ b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
@@ -66,6 +66,9 @@ class MorphTokenExchangeProvider extends ExchangeProvider {
@override
bool get isEnabled => true;
+ @override
+ bool get supportsFixedRate => false;
+
@override
ExchangeProviderDescription get description =>
ExchangeProviderDescription.morphToken;
diff --git a/lib/exchange/sideshift/sideshift_exchange_provider.dart b/lib/exchange/sideshift/sideshift_exchange_provider.dart
index 920dc9907..b93f0a80f 100644
--- a/lib/exchange/sideshift/sideshift_exchange_provider.dart
+++ b/lib/exchange/sideshift/sideshift_exchange_provider.dart
@@ -12,7 +12,6 @@ import 'package:cw_core/crypto_currency.dart';
import 'package:cake_wallet/exchange/trade_request.dart';
import 'package:cake_wallet/exchange/trade.dart';
import 'package:cake_wallet/exchange/limits.dart';
-import 'package:flutter/foundation.dart';
import 'package:http/http.dart';
class SideShiftExchangeProvider extends ExchangeProvider {
@@ -48,8 +47,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
return supportedCurrencies
.map((i) => supportedCurrencies
- .map((k) => ExchangePair(from: i, to: k, reverse: true))
- .where((c) => c != null))
+ .map((k) => ExchangePair(from: i, to: k, reverse: true)))
.expand((i) => i)
.toList();
}
@@ -257,8 +255,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
state = TradeState.deserialize(raw: status ?? 'created');
final expiredAtRaw = responseJSON['expiresAtISO'] as String;
- final expiredAt =
- expiredAtRaw != null ? DateTime.parse(expiredAtRaw).toLocal() : null;
+ final expiredAt = DateTime.tryParse(expiredAtRaw)?.toLocal();
return Trade(
id: id,
@@ -278,6 +275,9 @@ class SideShiftExchangeProvider extends ExchangeProvider {
@override
bool get isEnabled => true;
+ @override
+ bool get supportsFixedRate => true;
+
@override
String get title => 'SideShift';
diff --git a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
index 0fb799cec..97681f0aa 100644
--- a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
+++ b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
@@ -209,6 +209,9 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
@override
bool get isEnabled => true;
+ @override
+ bool get supportsFixedRate => false;
+
@override
String get title => 'SimpleSwap';
diff --git a/lib/exchange/xmrto/xmrto_exchange_provider.dart b/lib/exchange/xmrto/xmrto_exchange_provider.dart
index d5f79361e..da367e4d4 100644
--- a/lib/exchange/xmrto/xmrto_exchange_provider.dart
+++ b/lib/exchange/xmrto/xmrto_exchange_provider.dart
@@ -48,6 +48,9 @@ class XMRTOExchangeProvider extends ExchangeProvider {
@override
bool get isEnabled => true;
+ @override
+ bool get supportsFixedRate => false;
+
@override
ExchangeProviderDescription get description =>
ExchangeProviderDescription.xmrto;
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index cda65527a..49ee9ea95 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -306,10 +306,11 @@ abstract class ExchangeViewModelBase with Store {
}
Future<void> _calculateBestRate() async {
- final amount = double.tryParse(depositAmount) ?? 1;
+ final amount = double.tryParse(isFixedRateMode ? receiveAmount : depositAmount) ?? 1;
final result = await Future.wait<double>(
_tradeAvailableProviders
+ .where((element) => element.supportsFixedRate)
.map((element) => element.calculateAmount(
from: depositCurrency,
to: receiveCurrency,
From a9f0466825247f6e2a877aac3799851adb1bd142 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Tue, 6 Dec 2022 20:10:26 +0200
Subject: [PATCH 86/90] Revert SimpleSwap changes since we disabled it for
fixed rate
---
lib/exchange/simpleswap/simpleswap_exchange_provider.dart | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
index 97681f0aa..4c42835ed 100644
--- a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
+++ b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
@@ -53,7 +53,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
'currency_from': fromCurrency,
'currency_to': toCurrency,
'amount': amount.toString(),
- 'fixed': (!isFixedRateMode).toString()
+ 'fixed': isFixedRateMode.toString()
};
final uri = Uri.https(apiAuthority, getEstimatePath, params);
final response = await get(uri);
@@ -86,7 +86,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
"currency_from": _normalizeCryptoCurrency(_request.from),
"currency_to": _normalizeCryptoCurrency(_request.to),
"amount": _request.amount,
- "fixed": !isFixedRateMode,
+ "fixed": isFixedRateMode,
"user_refund_address": _request.refundAddress,
"address_to": _request.address
};
From 8ff8cf38b87a577df232b231a4b84ea7f7cd2cb0 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 7 Dec 2022 18:15:30 +0200
Subject: [PATCH 87/90] Check if the provider supportsFixedRate only if fixed
rate is applied [skip ci]
---
lib/view_model/exchange/exchange_view_model.dart | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 49ee9ea95..510e0ac3a 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -310,7 +310,7 @@ abstract class ExchangeViewModelBase with Store {
final result = await Future.wait<double>(
_tradeAvailableProviders
- .where((element) => element.supportsFixedRate)
+ .where((element) => !isFixedRateMode || element.supportsFixedRate)
.map((element) => element.calculateAmount(
from: depositCurrency,
to: receiveCurrency,
From 0da48f66fef74b94270ef77767c64182dbb4f08e Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 7 Dec 2022 21:09:15 +0200
Subject: [PATCH 88/90] Delegate returning rate to each provider to handle its
logic internally
---
.../changenow/changenow_exchange_provider.dart | 14 +++++++-------
.../sideshift/sideshift_exchange_provider.dart | 4 +---
.../simpleswap/simpleswap_exchange_provider.dart | 2 +-
lib/view_model/exchange/exchange_view_model.dart | 4 ++--
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
index 8ef376370..ca245923f 100644
--- a/lib/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -113,8 +113,8 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
// since we schedule to calculate the rate every 5 seconds we need to ensure that
// we have the latest rate id with the given inputs before creating the trade
await calculateAmount(
- from: _request.to,
- to: _request.from,
+ from: _request.from,
+ to: _request.to,
amount: double.tryParse(_request.toAmount) ?? 0,
isFixedRateMode: true,
isReceiveAmount: true,
@@ -222,10 +222,10 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
final type = isReverse ? 'reverse' : 'direct';
final flow = getFlow(isFixedRateMode);
final params = <String, String>{
- 'fromCurrency': isReverse ? normalizeCryptoCurrency(to) : normalizeCryptoCurrency(from),
- 'toCurrency': isReverse ? normalizeCryptoCurrency(from) : normalizeCryptoCurrency(to),
- 'fromNetwork': isReverse ? networkFor(to) : networkFor(from),
- 'toNetwork': isReverse ? networkFor(from) : networkFor(to),
+ 'fromCurrency': normalizeCryptoCurrency(from),
+ 'toCurrency': normalizeCryptoCurrency(to),
+ 'fromNetwork': networkFor(from),
+ 'toNetwork': networkFor(to),
'type': type,
'flow': flow};
@@ -246,7 +246,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
_lastUsedRateId = rateId;
}
- return isReverse ? fromAmount : toAmount;
+ return isReverse ? (amount / fromAmount) : (toAmount / amount);
} catch(e) {
print(e.toString());
return 0.0;
diff --git a/lib/exchange/sideshift/sideshift_exchange_provider.dart b/lib/exchange/sideshift/sideshift_exchange_provider.dart
index b93f0a80f..912ad89c5 100644
--- a/lib/exchange/sideshift/sideshift_exchange_provider.dart
+++ b/lib/exchange/sideshift/sideshift_exchange_provider.dart
@@ -79,9 +79,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
if (amount > max) return 0.00;
- final estimatedAmount = rate * amount;
-
- return estimatedAmount;
+ return rate;
} catch (_) {
return 0.00;
}
diff --git a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
index 4c42835ed..0c1027000 100644
--- a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
+++ b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
@@ -60,7 +60,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
if (response.body == "null") return 0.00;
final data = json.decode(response.body) as String;
- return double.parse(data);
+ return double.parse(data) / amount;
} catch (_) {
return 0.00;
}
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 510e0ac3a..80551304f 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -316,7 +316,7 @@ abstract class ExchangeViewModelBase with Store {
to: receiveCurrency,
amount: amount,
isFixedRateMode: isFixedRateMode,
- isReceiveAmount: false))
+ isReceiveAmount: isFixedRateMode))
);
_sortedAvailableProviders.clear();
@@ -324,7 +324,7 @@ abstract class ExchangeViewModelBase with Store {
for (int i=0;i<result.length;i++) {
if (result[i] != 0) {
/// add this provider as its valid for this trade
- _sortedAvailableProviders[result[i] / amount] = _tradeAvailableProviders[i];
+ _sortedAvailableProviders[result[i]] = _tradeAvailableProviders[i];
}
}
if (_sortedAvailableProviders.isNotEmpty) {
From d0c22aa082b5f61ad534544afd0ecf33b286aebc Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 8 Dec 2022 01:21:45 +0200
Subject: [PATCH 89/90] - Fix Change now request missing type - Only send
either to or from amount depending on fixed rate - take the trade amount from
the response
---
lib/exchange/changenow/changenow_exchange_provider.dart | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
index ca245923f..ee49855e4 100644
--- a/lib/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -97,15 +97,17 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
apiHeaderKey: apiKey,
'Content-Type': 'application/json'};
final flow = getFlow(isFixedRateMode);
+ final type = isFixedRateMode ? 'reverse' : 'direct';
final body = <String, String>{
'fromCurrency': normalizeCryptoCurrency(_request.from),
'toCurrency': normalizeCryptoCurrency(_request.to),
'fromNetwork': networkFor(_request.from),
'toNetwork': networkFor(_request.to),
- 'fromAmount': _request.fromAmount,
- 'toAmount': _request.toAmount,
+ if (!isFixedRateMode) 'fromAmount': _request.fromAmount,
+ if (isFixedRateMode) 'toAmount': _request.toAmount,
'address': _request.address,
'flow': flow,
+ 'type': type,
'refundAddress': _request.refundAddress
};
@@ -151,7 +153,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
refundAddress: refundAddress,
extraId: extraId,
createdAt: DateTime.now(),
- amount: _request.fromAmount,
+ amount: responseJSON['fromAmount']?.toString() ?? _request.fromAmount,
state: TradeState.created);
}
From 4b1e9a10ebd84daff704f27c88bf4f8a88cafd45 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 8 Dec 2022 21:14:42 +0200
Subject: [PATCH 90/90] - Rename calculateAmount to fetchRate to be more
descriptive - Add Disable Exchange change reaction to save in shared prefs
[skip ci]
---
lib/exchange/changenow/changenow_exchange_provider.dart | 4 ++--
lib/exchange/exchange_provider.dart | 2 +-
lib/exchange/morphtoken/morphtoken_exchange_provider.dart | 2 +-
lib/exchange/sideshift/sideshift_exchange_provider.dart | 2 +-
lib/exchange/simpleswap/simpleswap_exchange_provider.dart | 2 +-
lib/exchange/xmrto/xmrto_exchange_provider.dart | 2 +-
lib/store/settings_store.dart | 5 +++++
lib/view_model/exchange/exchange_view_model.dart | 2 +-
8 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
index ee49855e4..a9fb7c9ca 100644
--- a/lib/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -114,7 +114,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
if (isFixedRateMode) {
// since we schedule to calculate the rate every 5 seconds we need to ensure that
// we have the latest rate id with the given inputs before creating the trade
- await calculateAmount(
+ await fetchRate(
from: _request.from,
to: _request.to,
amount: double.tryParse(_request.toAmount) ?? 0,
@@ -208,7 +208,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
}
@override
- Future<double> calculateAmount(
+ Future<double> fetchRate(
{required CryptoCurrency from,
required CryptoCurrency to,
required double amount,
diff --git a/lib/exchange/exchange_provider.dart b/lib/exchange/exchange_provider.dart
index 108256015..763350c94 100644
--- a/lib/exchange/exchange_provider.dart
+++ b/lib/exchange/exchange_provider.dart
@@ -26,7 +26,7 @@ abstract class ExchangeProvider {
required TradeRequest request,
required bool isFixedRateMode});
Future<Trade> findTradeById({required String id});
- Future<double> calculateAmount({
+ Future<double> fetchRate({
required CryptoCurrency from,
required CryptoCurrency to,
required double amount,
diff --git a/lib/exchange/morphtoken/morphtoken_exchange_provider.dart b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
index 6650d4f3a..a2a72b24f 100644
--- a/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
+++ b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
@@ -203,7 +203,7 @@ class MorphTokenExchangeProvider extends ExchangeProvider {
}
@override
- Future<double> calculateAmount(
+ Future<double> fetchRate(
{required CryptoCurrency from,
required CryptoCurrency to,
required double amount,
diff --git a/lib/exchange/sideshift/sideshift_exchange_provider.dart b/lib/exchange/sideshift/sideshift_exchange_provider.dart
index 912ad89c5..98f18f058 100644
--- a/lib/exchange/sideshift/sideshift_exchange_provider.dart
+++ b/lib/exchange/sideshift/sideshift_exchange_provider.dart
@@ -57,7 +57,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
ExchangeProviderDescription.sideShift;
@override
- Future<double> calculateAmount(
+ Future<double> fetchRate(
{required CryptoCurrency from,
required CryptoCurrency to,
required double amount,
diff --git a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
index 0c1027000..2521c1486 100644
--- a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
+++ b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
@@ -36,7 +36,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
ExchangeProviderDescription.simpleSwap;
@override
- Future<double> calculateAmount(
+ Future<double> fetchRate(
{required CryptoCurrency from,
required CryptoCurrency to,
required double amount,
diff --git a/lib/exchange/xmrto/xmrto_exchange_provider.dart b/lib/exchange/xmrto/xmrto_exchange_provider.dart
index da367e4d4..536754e18 100644
--- a/lib/exchange/xmrto/xmrto_exchange_provider.dart
+++ b/lib/exchange/xmrto/xmrto_exchange_provider.dart
@@ -194,7 +194,7 @@ class XMRTOExchangeProvider extends ExchangeProvider {
}
@override
- Future<double> calculateAmount(
+ Future<double> fetchRate(
{required CryptoCurrency from,
required CryptoCurrency to,
required double amount,
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index 534ea67e9..e1ff316f4 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -115,6 +115,11 @@ abstract class SettingsStoreBase with Store {
(BalanceDisplayMode mode) => sharedPreferences.setInt(
PreferencesKey.currentBalanceDisplayModeKey, mode.serialize()));
+ reaction(
+ (_) => disableExchange,
+ (bool disableExchange) => sharedPreferences.setBool(
+ PreferencesKey.disableExchangeKey, disableExchange));
+
this
.nodes
.observe((change) {
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 80551304f..5c1f696b8 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -311,7 +311,7 @@ abstract class ExchangeViewModelBase with Store {
final result = await Future.wait<double>(
_tradeAvailableProviders
.where((element) => !isFixedRateMode || element.supportsFixedRate)
- .map((element) => element.calculateAmount(
+ .map((element) => element.fetchRate(
from: depositCurrency,
to: receiveCurrency,
amount: amount,