1.1.5 (#217)

* fixme * version bump * upgrade dependencies * fixme * version bump * upgrade dependencies * fix logic bug when pushing to default wallet * remove flickering changelog * fix animations for wallet list * further dependency updates * no longer persist labels from csv * changelog * replace rocket logo with peercoin logo * fix scan problem with offline marisma
peercoin · Feb 23, 2023 · 344a70e · 344a70e
1 parent 3baf00b
commit 344a70e
Show file tree

Hide file tree

Showing 15 changed files with 164 additions and 165 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### **1.1.5** (2023-02-23)
+* Fixed bug which would sometimes push to the wrong wallet after notification
+* Address labels are no longer persistent for CSV file imports
+
 ### **1.1.4** (2023-02-11)
 * Cease loading all wallets into cache on startup
 

diff --git a/assets/icon/ppc-icon-white.png b/assets/icon/ppc-icon-white.png
diff --git a/assets/img/setup-launch.png b/assets/img/setup-launch.png
diff --git a/lib/main.dart b/lib/main.dart
@@ -28,7 +28,7 @@ import 'models/wallet_utxo.dart';
 import 'providers/active_wallets.dart';
 import 'providers/electrum_connection.dart';
 import 'providers/encrypted_box.dart';
-import 'screens/setup/setup.dart';
+import 'screens/setup/setup_landing.dart';
 import 'screens/wallet/wallet_list.dart';
 import 'tools/app_localizations.dart';
 import 'tools/app_routes.dart';
@@ -113,7 +113,7 @@ void main() async {
     //check web session expired
 
     if (setupFinished == false || sessionExpired == true) {
-      _homeWidget = const SetupScreen();
+      _homeWidget = const SetupLandingScreen();
     } else if (failedAuths > 0) {
       _homeWidget = const AuthJailScreen(
         jailedFromHome: true,

diff --git a/lib/screens/setup/setup_auth.dart b/lib/screens/setup/setup_auth.dart
@@ -10,7 +10,7 @@ import '../../tools/app_localizations.dart';
 import '../../tools/app_routes.dart';
 import '../../widgets/buttons.dart';
 import '../../widgets/setup/session_slider.dart';
-import 'setup.dart';
+import 'setup_landing.dart';
 
 class SetupAuthScreen extends StatefulWidget {
   const SetupAuthScreen({Key? key}) : super(key: key);
@@ -54,7 +54,7 @@ class _SetupAuthScreenState extends State<SetupAuthScreen> {
       ),
       body: SingleChildScrollView(
         child: Container(
-          height: SetupScreen.calcContainerHeight(context),
+          height: SetupLandingScreen.calcContainerHeight(context),
           color: Theme.of(context).primaryColor,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -115,7 +115,8 @@ class _SetupAuthScreenState extends State<SetupAuthScreen> {
                                   ),
                                 ),
                                 value: _biometricsAllowed,
-                                activeColor: Theme.of(context).colorScheme.background,
+                                activeColor:
+                                    Theme.of(context).colorScheme.background,
                                 inactiveThumbColor: Colors.grey,
                                 onChanged: (newState) {
                                   if (_biometricsAvailable == false) {

diff --git a/lib/screens/setup/setup_create_wallet.dart b/lib/screens/setup/setup_create_wallet.dart
@@ -13,7 +13,7 @@ import '../../tools/app_routes.dart';
 import '../../tools/share_wrapper.dart';
 import '../../widgets/buttons.dart';
 import '../../widgets/loading_indicator.dart';
-import 'setup.dart';
+import 'setup_landing.dart';
 import '../../widgets/logout_dialog_dummy.dart'
     if (dart.library.html) '../../widgets/logout_dialog.dart';
 
@@ -174,7 +174,7 @@ class _SetupCreateWalletScreenState extends State<SetupCreateWalletScreen> {
       ),
       body: SingleChildScrollView(
         child: Container(
-          height: SetupScreen.calcContainerHeight(context),
+          height: SetupLandingScreen.calcContainerHeight(context),
           color: Theme.of(context).primaryColor,
           child: _isLoading
               ? const Center(
@@ -305,7 +305,8 @@ class _SetupCreateWalletScreenState extends State<SetupCreateWalletScreen> {
                                               Radius.circular(20),
                                             ),
                                             color: Theme.of(context)
-                                                .colorScheme.background,
+                                                .colorScheme
+                                                .background,
                                             border: Border.all(
                                               width: 2,
                                               color: _sharedYet

diff --git a/lib/screens/setup/setup_data_feeds.dart b/lib/screens/setup/setup_data_feeds.dart
@@ -8,7 +8,7 @@ import '../../providers/app_settings.dart';
 import '../../tools/app_localizations.dart';
 import '../../tools/app_routes.dart';
 import '../../widgets/buttons.dart';
-import 'setup.dart';
+import 'setup_landing.dart';
 
 class SetupDataFeedsScreen extends StatefulWidget {
   const SetupDataFeedsScreen({Key? key}) : super(key: key);
@@ -69,7 +69,7 @@ class _SetupDataFeedsScreenState extends State<SetupDataFeedsScreen> {
       ),
       body: SingleChildScrollView(
         child: Container(
-          height: SetupScreen.calcContainerHeight(context),
+          height: SetupLandingScreen.calcContainerHeight(context),
           color: Theme.of(context).primaryColor,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,

diff --git a/lib/screens/setup/setup_import_seed.dart b/lib/screens/setup/setup_import_seed.dart
@@ -10,7 +10,7 @@ import '../../tools/app_localizations.dart';
 import '../../tools/app_routes.dart';
 import '../../tools/logger_wrapper.dart';
 import '../../widgets/buttons.dart';
-import 'setup.dart';
+import 'setup_landing.dart';
 
 class SetupImportSeedScreen extends StatefulWidget {
   const SetupImportSeedScreen({Key? key}) : super(key: key);
@@ -83,7 +83,7 @@ class _SetupImportSeedState extends State<SetupImportSeedScreen> {
       ),
       body: SingleChildScrollView(
         child: Container(
-          height: SetupScreen.calcContainerHeight(context),
+          height: SetupLandingScreen.calcContainerHeight(context),
           color: Theme.of(context).primaryColor,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -219,8 +219,9 @@ class _SetupImportSeedState extends State<SetupImportSeedScreen> {
                                       fontSize: 16,
                                     ),
                                     filled: true,
-                                    fillColor:
-                                        Theme.of(context).colorScheme.background,
+                                    fillColor: Theme.of(context)
+                                        .colorScheme
+                                        .background,
                                     suffixIcon: IconButton(
                                       onPressed: () async {
                                         final focusScope =
@@ -244,7 +245,8 @@ class _SetupImportSeedState extends State<SetupImportSeedScreen> {
                                     focusedBorder: border,
                                     enabledBorder: border,
                                     errorStyle: TextStyle(
-                                      color: Theme.of(context).colorScheme.error,
+                                      color:
+                                          Theme.of(context).colorScheme.error,
                                     ),
                                     errorBorder: border,
                                     focusedErrorBorder: border,

diff --git a/lib/screens/setup/setup.dart → lib/screens/setup/setup_landing.dart b/lib/screens/setup/setup.dart → lib/screens/setup/setup_landing.dart
@@ -7,11 +7,11 @@ import '../../tools/app_routes.dart';
 import '../../widgets/buttons.dart';
 import '../../widgets/setup_progress.dart';
 
-class SetupScreen extends StatefulWidget {
-  const SetupScreen({Key? key}) : super(key: key);
+class SetupLandingScreen extends StatefulWidget {
+  const SetupLandingScreen({Key? key}) : super(key: key);
 
   @override
-  State<SetupScreen> createState() => _SetupScreenState();
+  State<SetupLandingScreen> createState() => _SetupLandingScreenState();
 
   static double calcContainerHeight(BuildContext ctx) {
     var height = MediaQuery.of(ctx).size.height;
@@ -27,7 +27,7 @@ class SetupScreen extends StatefulWidget {
   }
 }
 
-class _SetupScreenState extends State<SetupScreen> {
+class _SetupLandingScreenState extends State<SetupLandingScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -38,7 +38,7 @@ class _SetupScreenState extends State<SetupScreen> {
       ),
       body: SingleChildScrollView(
         child: Container(
-          height: SetupScreen.calcContainerHeight(context),
+          height: SetupLandingScreen.calcContainerHeight(context),
           color: Theme.of(context).primaryColor,
           child: Stack(
             fit: StackFit.expand,
@@ -57,7 +57,7 @@ class _SetupScreenState extends State<SetupScreen> {
                             height: MediaQuery.of(context).size.height / 20,
                           ),
                           Image.asset(
-                            'assets/img/setup-launch.png',
+                            'assets/icon/ppc-icon-white.png',
                             height: MediaQuery.of(context).size.height / 5,
                           ),
                           Column(

diff --git a/lib/screens/setup/setup_legal.dart b/lib/screens/setup/setup_legal.dart
@@ -6,7 +6,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 import '../../tools/app_localizations.dart';
 import '../../tools/app_routes.dart';
 import '../../widgets/buttons.dart';
-import 'setup.dart';
+import 'setup_landing.dart';
 
 class SetupLegalScreen extends StatefulWidget {
   const SetupLegalScreen({Key? key}) : super(key: key);
@@ -34,7 +34,7 @@ class _SetupLegalScreenState extends State<SetupLegalScreen> {
 
   double calcHeight(BuildContext context) {
     if (MediaQuery.of(context).size.width < 500) return 900;
-    return SetupScreen.calcContainerHeight(context);
+    return SetupLandingScreen.calcContainerHeight(context);
   }
 
   @override

diff --git a/lib/screens/wallet/wallet_list.dart b/lib/screens/wallet/wallet_list.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:async';
 import 'dart:io';
 
@@ -19,7 +21,7 @@ import '../../tools/background_sync.dart';
 import '../../tools/periodic_reminders.dart';
 import '../../tools/price_ticker.dart';
 import '../../tools/share_wrapper.dart';
-import '../../widgets/loading_indicator.dart';
+import '../../widgets/spinning_peercoin_icon.dart';
 import '../../widgets/wallet/new_wallet.dart';
 import '../../tools/session_checker.dart';
 import '../../widgets/buttons.dart';
@@ -42,15 +44,14 @@ class WalletListScreen extends StatefulWidget {
 
 class _WalletListScreenState extends State<WalletListScreen>
     with SingleTickerProviderStateMixin {
-  bool _isLoading = false;
   bool _initial = true;
   late ActiveWallets _activeWallets;
   late Animation<double> _animation;
   late AnimationController _controller;
   late Timer _priceTimer;
   late Timer _sessionTimer;
   late AppSettings _appSettings;
-  late List _activeWalletValues;
+  late List<CoinWallet> _activeWalletValues;
 
   @override
   void initState() {
@@ -118,7 +119,6 @@ class _WalletListScreenState extends State<WalletListScreen>
           const Duration(minutes: 10),
           (timer) async {
             if (await checkSessionExpired()) {
-              // ignore: use_build_context_synchronously
               Navigator.of(context).pop();
               LogoutDialog.reloadWindow();
             }
@@ -134,7 +134,6 @@ class _WalletListScreenState extends State<WalletListScreen>
       }
       if (widget.fromColdStart == true &&
           _appSettings.authenticationOptions!['walletList']!) {
-        // ignore: use_build_context_synchronously
         await Auth.requireAuth(
           context: context,
           biometricsAllowed: _appSettings.biometricsAllowed,
@@ -161,36 +160,28 @@ class _WalletListScreenState extends State<WalletListScreen>
           );
         }
         //push to default wallet
-        if (_activeWalletValues.length == 1) {
-          //only one wallet available, pushing to that one
-          setState(() {
-            _isLoading = true;
-          });
+        if (_activeWalletValues.length == 1 &&
+            widget.walletToOpenDirectly.isEmpty) {
+          //only one wallet available, pushing to that one (no walletToOpenDirectly set)
           if (!kIsWeb) {
+            context.loaderOverlay.show();
             await navigator.pushNamed(
               Routes.walletHome,
               arguments: {
-                'wallet': _activeWalletValues[0],
+                'wallet': _activeWalletValues.first,
               },
             );
           }
-          setState(() {
-            _isLoading = false;
-          });
-        } else if (_activeWalletValues.length > 1) {
+        } else if (_activeWalletValues.length > 1 ||
+            widget.walletToOpenDirectly.isNotEmpty) {
           if (defaultWallet != null) {
-            setState(() {
-              _isLoading = true;
-            });
+            context.loaderOverlay.show();
             if (!kIsWeb) {
               await navigator.pushNamed(
                 Routes.walletHome,
                 arguments: {'wallet': defaultWallet},
               );
             }
-            setState(() {
-              _isLoading = false;
-            });
           }
         }
       }
@@ -254,9 +245,9 @@ class _WalletListScreenState extends State<WalletListScreen>
             )
         ],
       ),
-      body: _isLoading || _initial
+      body: _initial
           ? const Center(
-              child: LoadingIndicator(),
+              child: SpinningPeercoinIcon(),
             )
           : Container(
               width: double.infinity,

diff --git a/lib/tools/background_sync.dart b/lib/tools/background_sync.dart
@@ -260,6 +260,13 @@ class BackgroundSync {
 
     Map<String, int> answerMap = {};
 
+    try {
+      await grpcClient.getBlockHeight(BlockHeightRequest());
+    } catch (e) {
+      //client not available
+      return answerMap;
+    }
+
     await Future.forEach(
       addressesToQuery.keys,
       (String addr) async {

diff --git a/lib/widgets/wallet/send_tab.dart b/lib/widgets/wallet/send_tab.dart
@@ -760,11 +760,6 @@ class _SendTabState extends State<SendTab> {
         ),
       );
 
-      //temporarily disable persisting labels for more than 100 addresses on web
-      if (kIsWeb && buildResult.recipients.length > 100) {
-        return;
-      } //TODO fix underlying performance issue with Hive on web that makes this necessary
-
       //persist labels
       _labelControllerList.asMap().forEach(
         (index, controller) {
@@ -801,17 +796,15 @@ class _SendTabState extends State<SendTab> {
         final amount = double.parse(
           row[1].replaceAll(',', '.'),
         );
-        final label = row.length == 3 ? row[2] : '';
         if (i == 0) {
           _addressControllerList[0].text = address;
-          _labelControllerList[0].text = label;
           _amountControllerList[0].text = amount.toString();
           _requestedAmountInCoinsList[0] = amount;
         } else {
           _addNewAddress(
             address: address,
             amount: amount,
-            label: label,
+            label: '',
             fromImport: true,
           );
           setState(() {