diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
index dac2af028..7c5890cc7 100644
--- a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
@@ -23,8 +23,6 @@ import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
 import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart';
-import 'package:stackwallet/widgets/rounded_date_picker/flutter_rounded_date_picker_widget.dart'
-    as datePicker;
 import 'package:stackwallet/widgets/rounded_white_container.dart';
 import 'package:tuple/tuple.dart';
 
@@ -154,10 +152,46 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
       await Future<void>.delayed(const Duration(milliseconds: 125));
     }
 
-    final date = await datePicker.showRoundedDatePicker(
+    final date = await showRoundedDatePicker(
       context: context,
       initialDate: DateTime.now(),
-      height: height * 0.5,
+      height: height / 3.0,
+      theme: ThemeData(
+        primarySwatch: Util.createMaterialColor(fetchedColor),
+      ),
+      //TODO pick a better initial date
+      // 2007 chosen as that is just before bitcoin launched
+      firstDate: DateTime(2007),
+      lastDate: DateTime.now(),
+      borderRadius: Constants.size.circularBorderRadius * 2,
+
+      textPositiveButton: "SELECT",
+
+      styleDatePicker: _buildDatePickerStyle(),
+      styleYearPicker: _buildYearPickerStyle(),
+    );
+    if (date != null) {
+      _restoreFromDate = date;
+      _dateController.text = Format.formatDate(date);
+    }
+  }
+
+  Future<void> chooseDesktopDate() async {
+    final height = MediaQuery.of(context).size.height;
+    final fetchedColor =
+        Theme.of(context).extension<StackColors>()!.accentColorDark;
+    // check and hide keyboard
+    if (FocusScope.of(context).hasFocus) {
+      FocusScope.of(context).unfocus();
+      await Future<void>.delayed(const Duration(milliseconds: 125));
+    }
+
+    final now = DateTime.now();
+
+    final date = await showRoundedDatePicker(
+      context: context,
+      initialDate: DateTime.now(),
+      height: height / 3.0,
       theme: ThemeData(
         primarySwatch: Util.createMaterialColor(fetchedColor),
       ),
@@ -283,15 +317,17 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
                   (coin == Coin.wownero &&
                       ref.watch(mnemonicWordCountStateProvider.state).state ==
                           25))
-
-                // if (!isDesktop)
+                if (!isDesktop)
+                  RestoreFromDatePicker(
+                    onTap: chooseDate,
+                    controller: _dateController,
+                  ),
+              if (isDesktop)
+                // TODO desktop date picker
                 RestoreFromDatePicker(
-                  onTap: chooseDate,
+                  onTap: chooseDesktopDate,
                   controller: _dateController,
                 ),
-
-              // if (isDesktop)
-              //   // TODO desktop date picker
               if (coin == Coin.monero ||
                   coin == Coin.epicCash ||
                   (coin == Coin.wownero &&
@@ -412,7 +448,6 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
                 isDesktop: isDesktop,
                 onPressed: _nextEnabled ? nextPressed : null,
               ),
-
               if (isDesktop)
                 const Spacer(
                   flex: 15,
diff --git a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart
index c5c3f22b1..c9499b054 100644
--- a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart
+++ b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart
@@ -2666,8 +2666,8 @@ class BitcoinCashWallet extends CoinServiceAPI {
       ], // dust limit is the minimum amount a change output should be
     ))["vSize"] as int;
     //todo: check if print needed
-    debugPrint("vSizeForOneOutput $vSizeForOneOutput");
-    debugPrint("vSizeForTwoOutPuts $vSizeForTwoOutPuts");
+    // debugPrint("vSizeForOneOutput $vSizeForOneOutput");
+    // debugPrint("vSizeForTwoOutPuts $vSizeForTwoOutPuts");
 
     // Assume 1 output, only for recipient and no change
     var feeForOneOutput = estimateTxFee(
diff --git a/lib/services/notes_service.dart b/lib/services/notes_service.dart
index cffe770e5..013600625 100644
--- a/lib/services/notes_service.dart
+++ b/lib/services/notes_service.dart
@@ -51,6 +51,7 @@ class NotesService extends ChangeNotifier {
     _notes[txid] = note;
     await DB.instance
         .put<dynamic>(boxName: walletId, key: 'notes', value: _notes);
+    //todo: check if this is needed
     Logging.instance.log("editOrAddNote: tx note saved", level: LogLevel.Info);
     await _refreshNotes();
   }
diff --git a/lib/utilities/default_nodes.dart b/lib/utilities/default_nodes.dart
index f4eb41b7c..e45e33aec 100644
--- a/lib/utilities/default_nodes.dart
+++ b/lib/utilities/default_nodes.dart
@@ -158,7 +158,7 @@ abstract class DefaultNodes {
       isDown: false);
 
   static NodeModel get bitcoinTestnet => NodeModel(
-        host: "electrumx-testnet.cypherstack.com",
+        host: "bitcoin-testnet.cypherstack.com",
         port: 51002,
         name: defaultName,
         id: _nodeId(Coin.bitcoinTestNet),