2.1.7

Author: Sterling Long

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2.1.6
+## 2.1.7
 
 - Removed image from QR Code, it was sometimes causing problems and needs more testing
 

example/sign/lib/utils/crypto/eip155.dart

@@ -209,7 +209,7 @@ class EIP155 {
     final Transaction t = Transaction.callContract(
       contract: contract,
       function: balanceFunction,
-      parameters: [EthereumAddress.fromHex(ContractDetails.balanceAddress)],
+      parameters: [EthereumAddress.fromHex(address)],
     );
 
     return await web3App.request(
@@ -218,7 +218,7 @@ class EIP155 {
       request: SessionRequestParams(
         method: 'eth_sendTransaction',
         // Check the `web3dart_extension` file for this function
-        params: [t.toJson(fromAddress: ContractDetails.balanceAddress)],
+        params: [t.toJson(fromAddress: address)],
       ),
     );
   }

lib/constants/constants.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 class WalletConnectModalConstants {
-  static const WALLETCONNECT_MODAL_VERSION = '2.1.6';
+  static const WALLETCONNECT_MODAL_VERSION = '2.1.7';
 
   static const Key helpPageKey = Key('helpPageKey');
   static const Key qrCodePageKey = Key('qrCodePageKey');

lib/models/walletconnect_modal_theme_data.dart

@@ -78,6 +78,11 @@ class WalletConnectModalThemeData with _$WalletConnectModalThemeData {
     overlay010: Color.fromARGB(26, 0, 0, 0),
     overlay020: Color.fromARGB(51, 0, 0, 0),
     overlay030: Color.fromARGB(77, 0, 0, 0),
+    // overlay002: Color.fromARGB(5, 255, 255, 255),
+    // overlay005: Color.fromARGB(13, 255, 255, 255),
+    // overlay010: Color.fromARGB(26, 255, 255, 255),
+    // overlay020: Color.fromARGB(51, 255, 255, 255),
+    // overlay030: Color.fromARGB(77, 255, 255, 255),
     foreground100: Color(0xFF141414),
     foreground200: Color(0xFF798686),
     foreground275: Color(0xFF95A0A0),

lib/services/explorer/explorer_service.dart

@@ -133,6 +133,7 @@ class ExplorerService implements IExplorerService {
       if (installed) {
         LoggerUtil.logger.v('Wallet ${item.name} installed: $installed');
       }
+
       _walletListUnsorted.add(
         GridListItemModel<WalletData>(
           title: item.name,

lib/services/utils/url/url_utils.dart

@@ -56,7 +56,7 @@ class UrlUtils extends IUrlUtils {
         if (p == PlatformExact.android) {
           return await androidAppCheck(uri);
         } else if (p == PlatformExact.iOS) {
-          await canLaunchUrlFunc(
+          return await canLaunchUrlFunc(
             Uri.parse(
               uri,
             ),

lib/widgets/grid_list/grid_list.dart

@@ -28,8 +28,8 @@ class GridList<T> extends StatelessWidget {
     required this.createListItem,
     this.heightOverride,
     this.longBottomSheetHeightOverride,
-    this.longBottomSheetAspectRatio = 0.73,
-    this.itemAspectRatio = 0.85,
+    this.longBottomSheetAspectRatio = 0.79,
+    this.itemAspectRatio = 0.75,
   });
 
   final GridListState state;
@@ -82,29 +82,32 @@ class GridList<T> extends StatelessWidget {
     return ValueListenableBuilder(
       valueListenable: provider.itemList,
       builder: (context, List<GridListItemModel<T>> value, child) {
+        // Get the number of items to display, and the height of the grid list
         int itemCount;
         double height;
         switch (state) {
           case GridListState.short:
             itemCount = min(8, value.length);
-            height = longBottomSheet ? 120 : (size.height * 0.3);
+            height = longBottomSheet ? 140 : 280;
             break;
           case GridListState.long:
             itemCount = value.length;
-            height = longBottomSheet ? 240 : (size.height * 0.6);
+            height = longBottomSheet ? 200 : 560;
             break;
           case GridListState.extraShort:
             itemCount = min(4, value.length);
-            height = 120;
+            height = 140;
             break;
         }
 
+        // Handle overrides
         if (longBottomSheet && longBottomSheetHeightOverride != null) {
           height = longBottomSheetHeightOverride!;
         } else if (!longBottomSheet && heightOverride != null) {
           height = heightOverride!;
         }
 
+        // Handle keyboard visibility if we have an empty list
         if (value.isEmpty) {
           return KeyboardVisibilityBuilder(
               builder: (context, isKeyboardVisible) {
@@ -139,6 +142,8 @@ class GridList<T> extends StatelessWidget {
             itemCount: itemCount,
             gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
               crossAxisCount: longBottomSheet ? 8 : 4,
+              mainAxisSpacing: 8.0,
+              crossAxisSpacing: 8.0,
               childAspectRatio: longBottomSheet
                   ? longBottomSheetAspectRatio
                   : itemAspectRatio,

lib/widgets/grid_list/grid_list_item.dart

@@ -18,15 +18,20 @@ class GridListItem extends StatelessWidget {
         WalletConnectModalTheme.getData(context);
 
     return Container(
-      margin: const EdgeInsets.all(4),
+      decoration: BoxDecoration(
+        color: themeData.overlay010,
+        borderRadius: BorderRadius.circular(8),
+      ),
       child: MaterialButton(
-        padding: const EdgeInsets.all(4),
+        padding: const EdgeInsets.all(8),
         onPressed: onSelect,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(8),
         ),
-        focusColor: themeData.overlay020,
-        hoverColor: themeData.overlay010,
+        elevation: 1,
+        focusElevation: 1,
+        hoverElevation: 1,
+        highlightElevation: 1,
         child: child,
       ),
     );

lib/widgets/grid_list/grid_list_wallet_item.dart

@@ -52,17 +52,19 @@ class GridListWalletItem extends StatelessWidget {
             color: themeData.foreground100,
           ),
         ),
-        const SizedBox(height: 2.0),
-        Text(
-          listItem.description ?? '',
-          textAlign: TextAlign.center,
-          maxLines: 1,
-          overflow: TextOverflow.clip,
-          style: TextStyle(
-            fontSize: 12.0,
-            color: themeData.foreground300,
+        if (listItem.description != null) ...[
+          const SizedBox(height: 2.0),
+          Text(
+            listItem.description ?? '',
+            textAlign: TextAlign.center,
+            maxLines: 1,
+            overflow: TextOverflow.clip,
+            style: TextStyle(
+              fontSize: 12.0,
+              color: themeData.foreground300,
+            ),
           ),
-        ),
+        ],
       ],
     );
   }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: walletconnect_modal_flutter
 description: The WalletConnectModal for WalletConnect built using Flutter.
-version: 2.1.6
+version: 2.1.7
 repository: https://github.com/WalletConnect/WalletConnectModalFlutter
 
 environment: