Merge pull request #666 from cake-tech/CW-180-advanced-startup-privacy-settings

[CW 180] advanced startup privacy settings

lib/di.dart

@@ -35,6 +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/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';
@@ -349,7 +350,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>()));
@@ -498,8 +499,12 @@ Future setup(
 
   getIt.registerFactory(() => OtherSettingsPage(getIt.get<OtherSettingsViewModel>()));
 
-  getIt.registerFactory(() =>
-      NodeCreateOrEditViewModel(_nodeSource, getIt.get<AppStore>().wallet!));
+  getIt.registerFactoryParam<NodeCreateOrEditViewModel, WalletType?, void>(
+    (WalletType? type, _) => NodeCreateOrEditViewModel(
+        _nodeSource,
+        type ?? getIt.get<AppStore>().wallet!.type,
+        getIt.get<SettingsStore>(),
+    ));
 
   getIt.registerFactory(
       () => NodeCreateOrEditPage(getIt.get<NodeCreateOrEditViewModel>()));
@@ -698,7 +703,7 @@ Future setup(
 
   getIt.registerFactoryParam<FullscreenQRPage, String, bool>(
           (String qrData, bool isLight) => FullscreenQRPage(qrData: qrData, isLight: isLight,));
-  
+
   getIt.registerFactory(() => IoniaApi());
 
   getIt.registerFactory(() => AnyPayApi());
@@ -718,7 +723,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,
       sendViewModel: getIt.get<SendViewModel>()
@@ -761,31 +766,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) );
   });
 
 
@@ -814,5 +819,8 @@ Future setup(
     (IoniaAnyPayPaymentInfo paymentInfo, AnyPayPaymentCommittedInfo committedInfo)
       => IoniaPaymentStatusPage(getIt.get<IoniaPaymentStatusViewModel>(param1: paymentInfo, param2: committedInfo)));
 
+  getIt.registerFactoryParam<AdvancedPrivacySettingsViewModel, WalletType, void>((type, _) =>
+      AdvancedPrivacySettingsViewModel(type, getIt.get<SettingsStore>()));
+
   _isSetupFinished = true;
 }

lib/router.dart

@@ -15,6 +15,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';
@@ -25,6 +26,8 @@ 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/advanced_privacy_settings_view_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
@@ -491,6 +494,15 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.onramperPage:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<OnRamperPage>());
 
+    case Routes.advancedPrivacySettings:
+      final type = settings.arguments as WalletType;
+
+      return CupertinoPageRoute<void>(
+          builder: (_) => AdvancedPrivacySettingsPage(
+            getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
+            getIt.get<NodeCreateOrEditViewModel>(param1: type),
+          ));
+
     default:
       return MaterialPageRoute<void>(
           builder: (_) => Scaffold(

lib/routes.dart

@@ -81,4 +81,5 @@ class Routes {
   static const privacyPage = '/privacy_page';
   static const displaySettingsPage = '/display_settings_page';
   static const otherSettingsPage = '/other_settings_page';
+  static const advancedPrivacySettings = '/advanced_privacy_settings';
 }

lib/src/screens/new_wallet/advanced_privacy_settings_page.dart

@@ -0,0 +1,104 @@
+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/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';
+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.advancedPrivacySettingsViewModel, this.nodeViewModel);
+
+  final AdvancedPrivacySettingsViewModel advancedPrivacySettingsViewModel;
+  final NodeCreateOrEditViewModel nodeViewModel;
+
+  @override
+  String get title => S.current.privacy_settings;
+
+  @override
+  Widget body(BuildContext context) =>
+      AdvancedPrivacySettingsBody(advancedPrivacySettingsViewModel, nodeViewModel);
+}
+
+class AdvancedPrivacySettingsBody extends StatefulWidget {
+  const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key? key})
+      : super(key: key);
+
+  final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
+  final NodeCreateOrEditViewModel nodeViewModel;
+
+  @override
+  _AdvancedPrivacySettingsBodyState createState() => _AdvancedPrivacySettingsBodyState();
+}
+
+class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBody> {
+  _AdvancedPrivacySettingsBodyState();
+
+  final _formKey = GlobalKey<FormState>();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.only(top: 24),
+      child: ScrollableWithBottomSection(
+        contentPadding: EdgeInsets.only(bottom: 24),
+        content: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            ...widget.privacySettingsViewModel.settings.map(
+              (item) => Observer(
+                builder: (_) => SettingsSwitcherCell(
+                  title: item.title,
+                  value: item.value(),
+                  onValueChange: item.onValueChange,
+                ),
+              ),
+            ),
+            Observer(
+              builder: (_) {
+                if (widget.privacySettingsViewModel.addCustomNode) {
+                  return Padding(
+                    padding: EdgeInsets.only(left: 24, right: 24, top: 24),
+                    child: NodeForm(
+                      formKey: _formKey,
+                      nodeViewModel: widget.nodeViewModel,
+                    ),
+                  );
+                }
+                return const SizedBox();
+              },
+            ),
+          ],
+        ),
+        bottomSectionPadding: EdgeInsets.all(24),
+        bottomSection: Column(
+          children: [
+            LoadingPrimaryButton(
+              onPressed: () {
+                widget.nodeViewModel.save(saveAsCurrent: true);
+                Navigator.pop(context);
+              },
+              text: S.of(context).continue_text,
+              color: Theme.of(context).accentTextTheme.bodyText1!.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.headline2?.color,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/src/screens/new_wallet/new_wallet_page.dart

@@ -200,18 +200,30 @@ 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.advancedPrivacySettings, arguments: _walletNewVM.type);
+                },
+                child: Text(S.of(context).advanced_privacy_settings),
+              ),
+            ],
           )),
     );
   }

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(

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,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ]
+        ],
+      ),
+    );
+  }
+}

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;
+}

lib/view_model/node_list/node_create_or_edit_view_model.dart

@@ -1,7 +1,7 @@
 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/wallet_base.dart';
 import 'package:cw_core/node.dart';
 import 'package:cw_core/wallet_type.dart';
 
@@ -11,7 +11,7 @@ class NodeCreateOrEditViewModel = NodeCreateOrEditViewModelBase
     with _$NodeCreateOrEditViewModel;
 
 abstract class NodeCreateOrEditViewModelBase with Store {
-  NodeCreateOrEditViewModelBase(this._nodeSource, this._wallet)
+  NodeCreateOrEditViewModelBase(this._nodeSource, this._walletType, this._settingsStore)
       : state = InitialExecutionState(),
         connectionState = InitialExecutionState(),
         useSSL = false,
@@ -49,8 +49,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,8 +62,9 @@ abstract class NodeCreateOrEditViewModelBase with Store {
     return uri;
   }
 
-  final WalletBase _wallet;
+  final WalletType _walletType;
   final Box<Node> _nodeSource;
+  final SettingsStore _settingsStore;
 
   @action
   void reset() {
@@ -76,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: _wallet.type, login: login, password: password,
+          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());
@@ -94,7 +100,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) {

res/values/strings_de.arb

@@ -661,5 +661,8 @@
   "privacy": "Datenschutz",
   "display_settings": "Anzeigeeinstellungen",
   "other_settings": "Andere Einstellungen",
-  "disable_exchange": "Exchange deaktivieren"
+  "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",
+  "add_custom_node": "Neuen benutzerdefinierten Knoten hinzufügen"
 }

res/values/strings_en.arb

@@ -661,5 +661,8 @@
   "privacy": "Privacy",
   "display_settings": "Display settings",
   "other_settings": "Other settings",
-  "disable_exchange": "Disable exchange"
+  "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",
+  "add_custom_node": "Add New Custom Node"
 }

res/values/strings_es.arb

@@ -661,5 +661,8 @@
   "privacy": "Privacidad",
   "display_settings": "Configuración de pantalla",
   "other_settings": "Otras configuraciones",
-  "disable_exchange": "Deshabilitar intercambio"
+  "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",
+  "add_custom_node": "Agregar nuevo nodo personalizado"
 }

res/values/strings_fr.arb

@@ -659,5 +659,8 @@
   "privacy": "Confidentialité",
   "display_settings": "Paramètres d'affichage",
   "other_settings": "Autres paramètres",
-  "disable_exchange": "Désactiver l'échange"
+  "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",
+  "add_custom_node": "Ajouter un nouveau nœud personnalisé"
 }

res/values/strings_hi.arb

@@ -661,5 +661,8 @@
   "privacy": "गोपनीयता",
   "display_settings": "प्रदर्शन सेटिंग्स",
   "other_settings": "अन्य सेटिंग्स",
-  "disable_exchange": "एक्सचेंज अक्षम करें"
+  "disable_exchange": "एक्सचेंज अक्षम करें",
+  "advanced_privacy_settings": "उन्नत गोपनीयता सेटिंग्स",
+  "settings_can_be_changed_later": "इन सेटिंग्स को बाद में ऐप सेटिंग में बदला जा सकता है",
+  "add_custom_node": "नया कस्टम नोड जोड़ें"
 }

res/values/strings_hr.arb

@@ -661,5 +661,8 @@
   "privacy": "Privatnost",
   "display_settings": "Postavke zaslona",
   "other_settings": "Ostale postavke",
-  "disable_exchange": "Onemogući exchange"
+  "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",
+  "add_custom_node": "Dodaj novi prilagođeni čvor"
 }

res/values/strings_it.arb

@@ -661,5 +661,8 @@
   "privacy": "Privacy",
   "display_settings": "Impostazioni di visualizzazione",
   "other_settings": "Altre impostazioni",
-  "disable_exchange": "Disabilita scambio"
+  "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",
+  "add_custom_node": "Aggiungi nuovo nodo personalizzato"
 }

res/values/strings_ja.arb

@@ -661,5 +661,8 @@
   "privacy": "プライバシー",
   "display_settings": "表示設定",
   "other_settings": "その他の設定",
-  "disable_exchange": "交換を無効にする"
+  "disable_exchange": "交換を無効にする",
+  "advanced_privacy_settings": "高度なプライバシー設定",
+  "settings_can_be_changed_later": "これらの設定は、後でアプリの設定で変更できます",
+  "add_custom_node": "新しいカスタム ノードを追加"
 }

res/values/strings_ko.arb

@@ -661,5 +661,8 @@
   "privacy": "프라이버시",
   "display_settings": "디스플레이 설정",
   "other_settings": "기타 설정",
-  "disable_exchange": "교환 비활성화"
+  "disable_exchange": "교환 비활성화",
+  "advanced_privacy_settings": "고급 개인 정보 설정",
+  "settings_can_be_changed_later": "이 설정은 나중에 앱 설정에서 변경할 수 있습니다.",
+  "add_custom_node": "새 사용자 정의 노드 추가"
 }

res/values/strings_nl.arb

@@ -661,5 +661,8 @@
   "privacy": "Privacy",
   "display_settings": "Weergave-instellingen",
   "other_settings": "Andere instellingen",
-  "disable_exchange": "Uitwisseling uitschakelen"
+  "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",
+  "add_custom_node": "Voeg een nieuw aangepast knooppunt toe"
 }

res/values/strings_pl.arb

@@ -661,5 +661,8 @@
   "privacy": "Prywatność",
   "display_settings": "Ustawienia wyświetlania",
   "other_settings": "Inne ustawienia",
-  "disable_exchange": "Wyłącz wymianę"
+  "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",
+  "add_custom_node": "Dodaj nowy węzeł niestandardowy"
 }

res/values/strings_pt.arb

@@ -660,5 +660,8 @@
   "privacy": "Privacidade",
   "display_settings": "Configurações de exibição",
   "other_settings": "Outras configurações",
-  "disable_exchange": "Desativar troca"
+  "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",
+  "add_custom_node": "Adicionar novo nó personalizado"
 }

res/values/strings_ru.arb

@@ -661,5 +661,8 @@
   "privacy": "Конфиденциальность",
   "display_settings": "Настройки отображения",
   "other_settings": "Другие настройки",
-  "disable_exchange": "Отключить обмен"
+  "disable_exchange": "Отключить обмен",
+  "advanced_privacy_settings": "Расширенные настройки конфиденциальности",
+  "settings_can_be_changed_later": "Эти настройки можно изменить позже в настройках приложения.",
+  "add_custom_node": "Добавить новый пользовательский узел"
 }

res/values/strings_uk.arb

@@ -660,5 +660,8 @@
   "privacy": "Конфіденційність",
   "display_settings": "Налаштування дисплея",
   "other_settings": "Інші налаштування",
-  "disable_exchange": "Вимкнути exchange"
+  "disable_exchange": "Вимкнути exchange",
+  "advanced_privacy_settings": "Розширені налаштування конфіденційності",
+  "settings_can_be_changed_later": "Ці параметри можна змінити пізніше в налаштуваннях програми",
+  "add_custom_node": "Додати новий спеціальний вузол"
 }

res/values/strings_zh.arb

@@ -659,5 +659,8 @@
   "privacy":"隐私",
   "display_settings": "显示设置",
   "other_settings": "其他设置",
-  "disable_exchange": "禁用交换"
+  "disable_exchange": "禁用交换",
+  "advanced_privacy_settings": "高级隐私设置",
+  "settings_can_be_changed_later": "稍后可以在应用设置中更改这些设置",
+  "add_custom_node": "添加新的自定义节点"
 }