fix kIsWeb / platform bug in receive tab (#244)

* fix kIsWeb / platform bug in receive tab * Update dependencies and fix network parameter in coin model * Bump version to 1.2.4+136 * Update dependencies and fix context usage * Update compileSdkVersion and targetSdkVersion to 34
peercoin · Mar 24, 2024 · 3b50dcb · 3b50dcb
1 parent cc5a2c7
commit 3b50dcb
Show file tree

Hide file tree

Showing 14 changed files with 487 additions and 399 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext.kotlin_version = '1.7.21'
     ext {
-       compileSdkVersion   = 33         
-       targetSdkVersion    = 33               
+       compileSdkVersion   = 34        
+       targetSdkVersion    = 34               
        appCompatVersion    = "1.1.0"       
     }
 

diff --git a/lib/models/available_coins.dart b/lib/models/available_coins.dart
@@ -13,7 +13,7 @@ class AvailableCoins {
       letterCode: 'PPC',
       iconPath: 'assets/icon/ppc-icon-48.png',
       iconPathTransparent: 'assets/icon/ppc-icon-white-48.png',
-      networkType: NetworkParams.mainnet,
+      networkType: Network.mainnet,
       opreturnSize: 256,
       fractions: 6,
       minimumTxValue: 10000,
@@ -39,7 +39,7 @@ class AvailableCoins {
       letterCode: 'tPPC',
       iconPath: 'assets/icon/ppc-icon-48-grey.png',
       iconPathTransparent: 'assets/icon/ppc-icon-48-grey.png',
-      networkType: NetworkParams.testnet,
+      networkType: Network.testnet,
       opreturnSize: 256,
       fixedFee: true,
       fractions: 6,

diff --git a/lib/models/coin.dart b/lib/models/coin.dart
@@ -7,7 +7,7 @@ class Coin {
   final String iconPath;
   final String iconPathTransparent;
   final String uriCode;
-  final NetworkParams networkType;
+  final Network networkType;
   final int fractions;
   final int minimumTxValue;
   final double fixedFeePerKb;

diff --git a/lib/screens/changelog.dart b/lib/screens/changelog.dart
@@ -44,7 +44,7 @@ class ChangeLogScreen extends StatelessWidget {
                       styleSheet:
                           MarkdownStyleSheet.fromTheme(Theme.of(context))
                               .copyWith(
-                        textScaleFactor: 1.1,
+                        textScaler: const TextScaler.linear(1.1),
                       ),
                     ),
                   ],

diff --git a/lib/screens/setup/setup_import_seed.dart b/lib/screens/setup/setup_import_seed.dart
@@ -44,7 +44,7 @@ class _SetupImportSeedState extends State<SetupImportSeedScreen> {
         'createWallet',
         e.toString(),
       );
-      if (mounted) {
+      if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
             content: Text(

diff --git a/lib/screens/wallet/import_wif.dart b/lib/screens/wallet/import_wif.dart
@@ -122,7 +122,7 @@ class _ImportWifScreenState extends State<ImportWifScreen> {
         ),
       );
     } else {
-      if (mounted) {
+      if (context.mounted) {
         await showDialog(
           context: ctx,
           builder: (BuildContext context) {

diff --git a/lib/screens/wallet/transaction_confirmation.dart b/lib/screens/wallet/transaction_confirmation.dart
@@ -315,7 +315,7 @@ class _TransactionConfirmationScreenState
                                         'showTransactionConfirmation',
                                         e.toString(),
                                       );
-                                      if (mounted) {
+                                      if (context.mounted) {
                                         ScaffoldMessenger.of(context)
                                             .showSnackBar(
                                           SnackBar(

diff --git a/lib/screens/wallet/wallet_home.dart b/lib/screens/wallet/wallet_home.dart
@@ -492,7 +492,7 @@ class _WalletHomeState extends State<WalletHomeScreen>
               newState: false,
             );
 
-            if (mounted) {
+            if (context.mounted) {
               context.loaderOverlay.hide();
               Navigator.of(context).pop(); // pops modal bottom sheet
             }

diff --git a/lib/tools/validators.dart b/lib/tools/validators.dart
@@ -1,7 +1,7 @@
 import 'package:coinlib_flutter/coinlib_flutter.dart';
 
 /// Returns true if the address is valid for the given network.
-bool validateAddress(String address, NetworkParams network) {
+bool validateAddress(String address, Network network) {
   try {
     Address.fromString(address, network);
     return true;

diff --git a/lib/widgets/wallet/receive_tab.dart b/lib/widgets/wallet/receive_tab.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
@@ -163,41 +164,43 @@ class _ReceiveTabState extends State<ReceiveTab> {
           ),
         ),
       );
-    } else if (widget.wallet.letterCode == 'PPC' && Platform.isIOS == false) {
-      return Align(
-        child: PeerContainer(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: <Widget>[
-              PeerServiceTitle(
-                title: AppLocalizations.instance.translate('buy_peercoin'),
-              ),
-              const SizedBox(height: 20),
-              Text(
-                AppLocalizations.instance
-                    .translate('receive_website_description'),
-                textAlign: TextAlign.center,
-              ),
-              const SizedBox(height: 20),
-              PeerButton(
-                text: AppLocalizations.instance
-                    .translate('receive_website_credit'),
-                action: () {
-                  launchURL('https://ppc.lol/buy');
-                },
-              ),
-              const SizedBox(height: 20),
-              PeerButton(
-                text: AppLocalizations.instance
-                    .translate('receive_website_exchandes'),
-                action: () {
-                  launchURL('https://ppc.lol/exchanges');
-                },
-              ),
-            ],
+    } else if (!kIsWeb) {
+      if (widget.wallet.letterCode == 'PPC' && Platform.isIOS == false) {
+        return Align(
+          child: PeerContainer(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[
+                PeerServiceTitle(
+                  title: AppLocalizations.instance.translate('buy_peercoin'),
+                ),
+                const SizedBox(height: 20),
+                Text(
+                  AppLocalizations.instance
+                      .translate('receive_website_description'),
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 20),
+                PeerButton(
+                  text: AppLocalizations.instance
+                      .translate('receive_website_credit'),
+                  action: () {
+                    launchURL('https://ppc.lol/buy');
+                  },
+                ),
+                const SizedBox(height: 20),
+                PeerButton(
+                  text: AppLocalizations.instance
+                      .translate('receive_website_exchandes'),
+                  action: () {
+                    launchURL('https://ppc.lol/exchanges');
+                  },
+                ),
+              ],
+            ),
           ),
-        ),
-      );
+        );
+      }
     }
     return const SizedBox();
   }

diff --git a/lib/widgets/wallet/send_tab.dart b/lib/widgets/wallet/send_tab.dart
@@ -120,11 +120,10 @@ class _SendTabState extends State<SendTab> {
                               currentIndex: _currentAddressIndex + 1,
                               numberOfRecipients: _numberOfRecipients,
                               raiseNewindex: (int newIndex) => setState(
-                                () => {
-                                  if (triggerFormValidation())
-                                    {
-                                      _currentAddressIndex = newIndex - 1,
-                                    },
+                                () {
+                                  if (triggerFormValidation()) {
+                                    _currentAddressIndex = newIndex - 1;
+                                  }
                                 },
                               ),
                             )