Merge pull request #919 from cypherstack/julian_working_branch

fixes

lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart

@@ -13,7 +13,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 
 import '../../../../app_config.dart';
 import '../../../../models/keys/cw_key_data.dart';
@@ -32,6 +31,8 @@ import '../../../../widgets/background.dart';
 import '../../../../widgets/custom_buttons/app_bar_icon_button.dart';
 import '../../../../widgets/custom_buttons/blue_text_button.dart';
 import '../../../../widgets/custom_buttons/simple_copy_button.dart';
+import '../../../../widgets/desktop/primary_button.dart';
+import '../../../../widgets/desktop/secondary_button.dart';
 import '../../../../widgets/detail_item.dart';
 import '../../../../widgets/qr.dart';
 import '../../../../widgets/rounded_white_container.dart';
@@ -47,7 +48,6 @@ class WalletBackupView extends ConsumerWidget {
     required this.walletId,
     required this.mnemonic,
     this.frostWalletData,
-    this.clipboardInterface = const ClipboardWrapper(),
     this.keyData,
   });
 
@@ -61,7 +61,6 @@ class WalletBackupView extends ConsumerWidget {
     String keys,
     ({String config, String keys})? prevGen,
   })? frostWalletData;
-  final ClipboardInterface clipboardInterface;
   final KeyDataInterface? keyData;
 
   @override
@@ -107,40 +106,6 @@ class WalletBackupView extends ConsumerWidget {
                   },
                 ),
               ),
-            if (!frost && keyData == null)
-              Padding(
-                padding: const EdgeInsets.all(10),
-                child: AspectRatio(
-                  aspectRatio: 1,
-                  child: AppBarIconButton(
-                    color:
-                        Theme.of(context).extension<StackColors>()!.background,
-                    shadows: const [],
-                    icon: SvgPicture.asset(
-                      Assets.svg.copy,
-                      width: 20,
-                      height: 20,
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .topNavIconPrimary,
-                    ),
-                    onPressed: () async {
-                      await clipboardInterface
-                          .setData(ClipboardData(text: mnemonic.join(" ")));
-                      if (context.mounted) {
-                        unawaited(
-                          showFloatingFlushBar(
-                            type: FlushBarType.info,
-                            message: "Copied to clipboard",
-                            iconAsset: Assets.svg.copy,
-                            context: context,
-                          ),
-                        );
-                      }
-                    },
-                  ),
-                ),
-              ),
           ],
         ),
         body: Padding(
@@ -161,19 +126,22 @@ class WalletBackupView extends ConsumerWidget {
 }
 
 class _Mnemonic extends ConsumerWidget {
-  const _Mnemonic({super.key, required this.walletId, required this.mnemonic});
+  const _Mnemonic({
+    super.key,
+    required this.walletId,
+    required this.mnemonic,
+    this.clipboardInterface = const ClipboardWrapper(),
+  });
 
   final String walletId;
   final List<String> mnemonic;
+  final ClipboardInterface clipboardInterface;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        const SizedBox(
-          height: 4,
-        ),
         Text(
           ref.watch(pWalletName(walletId)),
           textAlign: TextAlign.center,
@@ -221,10 +189,28 @@ class _Mnemonic extends ConsumerWidget {
         const SizedBox(
           height: 12,
         ),
-        TextButton(
+        SecondaryButton(
-          style: Theme.of(context)
+          label: "Copy",
-              .extension<StackColors>()!
+          onPressed: () async {
-              .getPrimaryEnabledButtonStyle(context),
+            await clipboardInterface
+                .setData(ClipboardData(text: mnemonic.join(" ")));
+            if (context.mounted) {
+              unawaited(
+                showFloatingFlushBar(
+                  type: FlushBarType.info,
+                  message: "Copied to clipboard",
+                  iconAsset: Assets.svg.copy,
+                  context: context,
+                ),
+              );
+            }
+          },
+        ),
+        const SizedBox(
+          height: 12,
+        ),
+        PrimaryButton(
+          label: "Show QR Code",
           onPressed: () {
             final String data = AddressUtils.encodeQRSeedData(mnemonic);
 
@@ -293,10 +279,6 @@ class _Mnemonic extends ConsumerWidget {
               },
             );
           },
-          child: Text(
-            "Show QR Code",
-            style: STextStyles.button(context),
-          ),
         ),
       ],
     );
@@ -310,8 +292,6 @@ class _FrostKeys extends StatelessWidget {
     this.frostWalletData,
   });
 
-  static const String routeName = "/walletBackup";
-
   final String walletId;
   final ({
     String myName,

lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/wallet_keys_desktop_popup.dart

@@ -277,22 +277,6 @@ class _Mnemonic extends StatelessWidget {
             children: [
               Expanded(
                 child: SecondaryButton(
-                  label: "Show QR code",
-                  onPressed: () {
-                    // TODO: address utils
-                    final String value = AddressUtils.encodeQRSeedData(words);
-                    Navigator.of(context).pushNamed(
-                      QRCodeDesktopPopupContent.routeName,
-                      arguments: value,
-                    );
-                  },
-                ),
-              ),
-              const SizedBox(
-                width: 16,
-              ),
-              Expanded(
-                child: PrimaryButton(
                   label: "Copy",
                   onPressed: () async {
                     await clipboardInterface.setData(
@@ -311,6 +295,22 @@ class _Mnemonic extends StatelessWidget {
                   },
                 ),
               ),
+              const SizedBox(
+                width: 16,
+              ),
+              Expanded(
+                child: PrimaryButton(
+                  label: "Show QR code",
+                  onPressed: () {
+                    // TODO: address utils
+                    final String value = AddressUtils.encodeQRSeedData(words);
+                    Navigator.of(context).pushNamed(
+                      QRCodeDesktopPopupContent.routeName,
+                      arguments: value,
+                    );
+                  },
+                ),
+              ),
             ],
           ),
         ),

scripts/app_config/templates/pubspec.template

@@ -171,7 +171,12 @@ dependencies:
   convert: ^3.1.1
   flutter_hooks: ^0.20.3
   meta: ^1.9.1
-  coinlib_flutter: ^2.0.0
+#  coinlib_flutter: ^2.1.0-rc.1
+  coinlib_flutter:
+    git:
+      url: https://github.com/peercoin/coinlib.git
+      ref: b88e68e2e10ffe54d802deeed6b9e83da7721a1f
+      path: coinlib_flutter
   electrum_adapter:
     git:
       url: https://github.com/cypherstack/electrum_adapter.git
@@ -180,7 +185,7 @@ dependencies:
   solana:
     git: # TODO [prio=low]: Revert to official package once Tor support is merged upstream.
       url: https://github.com/cypherstack/espresso-cash-public.git
-      ref: a83e375678eb22fe544dc125d29bbec0fb833882
+      ref: 706be5f166d31736c443cca4cd311b7fcfc2a9bf
       path: packages/solana
   calendar_date_picker2: ^1.0.2
   sqlite3: ^2.4.3
@@ -210,6 +215,20 @@ flutter_native_splash:
   android_disable_fullscreen: true
 
 dependency_overrides:
+
+  # coin lib git for testing while waiting for publishing
+  coinlib:
+    git:
+      url: https://github.com/peercoin/coinlib.git
+      ref: b88e68e2e10ffe54d802deeed6b9e83da7721a1f
+      path: coinlib
+
+  coinlib_flutter:
+    git:
+      url: https://github.com/peercoin/coinlib.git
+      ref: b88e68e2e10ffe54d802deeed6b9e83da7721a1f
+      path: coinlib_flutter
+
   # adding here due to pure laziness
   tor_ffi_plugin:
     git: