1.2.7

CHANGELOG.md

@@ -1,3 +1,8 @@
+### **1.2.7** (2023-05-24)
+
+- Various bug fixes and improvements related to flutter upgrade
+- Improved flow for transaction signing, now with confirmation and more feedback
+
 ### **1.2.6** (2023-04-20)
 
 - Improved transaction signing handling and error messages

assets/translations/en.json

@@ -510,5 +510,9 @@
   "sign_transaction_step_3_button_alt": "Copy hex to clipboard",
   "sign_transaction_step_3_description": "This is your signed transaction hex. You may double tap to copy it to the clipboard.",
   "sign_transaction_input_selector_title": "Select which inputs to sign",
-  "sign_transaction_signing_failed": "Transaction signing failed."
+  "sign_transaction_signing_failed": "Transaction signing failed.",
+  "sign_transaction_inputs": "Inputs",
+  "sign_transaction_confirmation_title": "Please review transaction",
+  "sign_transaction_confirmation_input_signed": "Signed",
+  "sign_transaction_confirmation_input_unsigned": "Not signed"
 }

assets/translations/enm.json

@@ -0,0 +1 @@
+{}

lib/screens/settings/app_settings_default_wallet.dart

@@ -50,13 +50,13 @@ class _AppSettingsDefaultWalletScreenState
   List<Widget> generateDefaultWallets() {
     final inkwells = _availableWallets.map((wallet) {
       return InkWell(
-        onTap: () => saveDefaultWallet(wallet.letterCode),
+        onTap: () => saveDefaultWallet(wallet.name),
         child: ListTile(
           title: Text(wallet.title),
           leading: Radio(
-            value: wallet.letterCode,
+            value: wallet.name,
             groupValue: _defaultWallet,
-            onChanged: (dynamic _) => saveDefaultWallet(wallet.letterCode),
+            onChanged: (dynamic _) => saveDefaultWallet(wallet.name),
           ),
         ),
       );

lib/screens/setup/setup_auth.dart

@@ -115,9 +115,6 @@ class _SetupAuthScreenState extends State<SetupAuthScreen> {
                                   ),
                                 ),
                                 value: _biometricsAllowed,
-                                activeColor:
-                                    Theme.of(context).colorScheme.background,
-                                inactiveThumbColor: Colors.grey,
                                 onChanged: (newState) {
                                   if (_biometricsAvailable == false) {
                                     ScaffoldMessenger.of(context).showSnackBar(

lib/screens/setup/setup_create_wallet.dart

@@ -306,7 +306,7 @@ class _SetupCreateWalletScreenState extends State<SetupCreateWalletScreen> {
                                             ),
                                             color: Theme.of(context)
                                                 .colorScheme
-                                                .background,
+                                                .surface,
                                             border: Border.all(
                                               width: 2,
                                               color: _sharedYet

lib/screens/setup/setup_import_seed.dart

@@ -176,7 +176,7 @@ class _SetupImportSeedState extends State<SetupImportSeedScreen> {
                                 borderRadius: const BorderRadius.all(
                                   Radius.circular(20),
                                 ),
-                                color: Theme.of(context).colorScheme.background,
+                                color: Theme.of(context).colorScheme.surface,
                                 border: Border.all(
                                   width: 2,
                                   color: Theme.of(context).primaryColor,
@@ -223,7 +223,7 @@ class _SetupImportSeedState extends State<SetupImportSeedScreen> {
                                     filled: true,
                                     fillColor: Theme.of(context)
                                         .colorScheme
-                                        .background,
+                                        .surface,
                                     suffixIcon: IconButton(
                                       onPressed: () async {
                                         final focusScope =

lib/screens/setup/setup_landing.dart

@@ -57,7 +57,7 @@ class _SetupLandingScreenState extends State<SetupLandingScreen> {
                             height: MediaQuery.of(context).size.height / 20,
                           ),
                           Image.asset(
-                            'assets/icon/ppc-icon-white.png',
+                            'assets/icon/ppc-icon-white-256.png',
                             height: MediaQuery.of(context).size.height / 5,
                           ),
                           Column(
@@ -135,7 +135,7 @@ class _SetupLandingScreenState extends State<SetupLandingScreen> {
                   },
                   icon: Icon(
                     Icons.language_rounded,
-                    color: Theme.of(context).colorScheme.background,
+                    color: Theme.of(context).colorScheme.surface,
                     size: 32,
                   ),
                 ),

lib/screens/wallet/address_selector.dart

@@ -140,7 +140,7 @@ class _AddressSelectorScreenState extends State<AddressSelectorScreen> {
                   child: TextFormField(
                     autofocus: true,
                     style: TextStyle(
-                      color: Theme.of(context).colorScheme.background,
+                      color: Theme.of(context).colorScheme.surface,
                     ),
                     key: const Key('selectorSearchKey'),
                     textInputAction: TextInputAction.done,
@@ -149,15 +149,15 @@ class _AddressSelectorScreenState extends State<AddressSelectorScreen> {
                       hintText: AppLocalizations.instance
                           .translate('addressbook_search'),
                       hintStyle: TextStyle(
-                        color: Theme.of(context).colorScheme.background,
+                        color: Theme.of(context).colorScheme.surface,
                       ),
                       suffixIcon: IconButton(
                         onPressed: () => setState(() {
                           _searchActive = false;
                         }),
                         icon: Icon(
                           Icons.close,
-                          color: Theme.of(context).colorScheme.background,
+                          color: Theme.of(context).colorScheme.surface,
                         ),
                       ),
                     ),

lib/screens/wallet/transaction_details.dart

@@ -165,7 +165,7 @@ class TransactionDetails extends StatelessWidget {
                       children: [
                         DoubleTabToClipboard(
                           clipBoardData: tx.broadcastHex,
-                          child: Text(
+                          child: SelectableText(
                             tx.broadcastHex,
                           ),
                         ),

lib/screens/wallet/wallet_home.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:loader_overlay/loader_overlay.dart';
 import 'package:peercoin/data_sources/electrum_backend.dart';
 import 'package:peercoin/providers/server_provider.dart';
+import 'package:peercoin/screens/wallet/wallet_sign_transaction.dart';
 import 'package:peercoin/widgets/wallet/address_book/addresses_tab_watch_only.dart';
 import 'package:peercoin/widgets/wallet/wallet_reset_bottom_sheet.dart';
 import 'package:provider/provider.dart';
@@ -465,7 +466,10 @@ class _WalletHomeState extends State<WalletHomeScreen>
       case 'transaction_signing':
         Navigator.of(context).pushNamed(
           Routes.walletTransactionSigning,
-          arguments: _wallet.name,
+          arguments: WalletSignTransactionArguments(
+            walletName: _wallet.name,
+            coinLetterCode: _wallet.letterCode,
+          ),
         );
         break;
       default:
@@ -791,7 +795,7 @@ class _WalletHomeState extends State<WalletHomeScreen>
   Widget build(BuildContext context) {
     return Scaffold(
       bottomNavigationBar: _calcBottomNavBar(context),
-      appBar: _selectedTab == WalletTab.addresses
+      appBar: _selectedTab == WalletTab.addresses && _wallet.watchOnly
           ? addressTabWatchOnlySearchAppBar()
           : AppBar(
               centerTitle: true,

lib/screens/wallet/wallet_list.dart

@@ -335,7 +335,7 @@ class _WalletListScreenState extends State<WalletListScreen>
                             borderRadius:
                                 const BorderRadius.all(Radius.circular(50.0)),
                             border: Border.all(
-                              color: Theme.of(context).colorScheme.background,
+                              color: Theme.of(context).colorScheme.surface,
                               width: 2,
                             ),
                           ),
@@ -365,7 +365,7 @@ class _WalletListScreenState extends State<WalletListScreen>
                       style: TextStyle(
                         letterSpacing: 1.4,
                         fontSize: 24,
-                        color: Theme.of(context).colorScheme.background,
+                        color: Theme.of(context).colorScheme.surface,
                       ),
                     ),
                   ),
@@ -386,7 +386,7 @@ class _WalletListScreenState extends State<WalletListScreen>
                                   fontSize: 16,
                                   fontStyle: FontStyle.italic,
                                   color:
-                                      Theme.of(context).colorScheme.background,
+                                      Theme.of(context).colorScheme.surface,
                                 ),
                               ),
                               if (_importedSeed)
@@ -438,7 +438,7 @@ class _WalletListScreenState extends State<WalletListScreen>
                                     horizontal: 16,
                                   ),
                                   color:
-                                      Theme.of(context).colorScheme.background,
+                                      Theme.of(context).colorScheme.surface,
                                   child: Column(
                                     children: [
                                       InkWell(