Merge pull request #262 from WalletConnect/chore/wallet_app_bug_fixes

Bug fixes for Sample Wallet
WalletConnect · Feb 7, 2024 · 25a3828 · 25a3828
2 parents ddc27c5 + 014f858
commit 25a3828
Show file tree

Hide file tree

Showing 20 changed files with 572 additions and 332 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.0-beta02
+
+- Improvements on example wallet
+
 ## 2.2.0-beta01
 
 - Added Smart Contract interactions to SignEngine

diff --git a/example/dapp/lib/widgets/session_widget.dart b/example/dapp/lib/widgets/session_widget.dart
@@ -60,10 +60,11 @@ class SessionWidgetState extends State<SessionWidget> {
         child: ElevatedButton(
           onPressed: () async {
             await widget.web3App.disconnectSession(
-                topic: widget.session.topic,
-                reason: Errors.getSdkError(
-                  Errors.USER_DISCONNECTED,
-                ));
+              topic: widget.session.topic,
+              reason: Errors.getSdkError(
+                Errors.USER_DISCONNECTED,
+              ),
+            );
           },
           style: ButtonStyle(
             backgroundColor: MaterialStateProperty.all<Color>(

diff --git a/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_listener.dart b/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_listener.dart
@@ -43,13 +43,16 @@ class BottomSheetListenerState extends State<BottomSheetListener> {
           maxHeight: MediaQuery.of(context).size.height * 0.9,
         ),
         builder: (context) {
+          if (item.closeAfter > 0) {
+            Future.delayed(Duration(seconds: item.closeAfter), () {
+              Navigator.pop(context);
+            });
+          }
           return Container(
             decoration: const BoxDecoration(
               color: Colors.white,
               borderRadius: BorderRadius.all(
-                Radius.circular(
-                  StyleConstants.linear16,
-                ),
+                Radius.circular(StyleConstants.linear16),
               ),
             ),
             padding: EdgeInsets.only(
@@ -62,7 +65,23 @@ class BottomSheetListenerState extends State<BottomSheetListener> {
             margin: const EdgeInsets.all(
               StyleConstants.linear16,
             ),
-            child: item.widget,
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    IconButton(
+                      padding: const EdgeInsets.all(0.0),
+                      visualDensity: VisualDensity.compact,
+                      onPressed: () => Navigator.pop(context),
+                      icon: const Icon(Icons.close_sharp),
+                    ),
+                  ],
+                ),
+                Flexible(child: item.widget),
+              ],
+            ),
           );
         },
       );

diff --git a/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_service.dart b/example/wallet/lib/dependencies/bottom_sheet/bottom_sheet_service.dart
@@ -13,12 +13,14 @@ class BottomSheetService extends IBottomSheetService {
   @override
   Future<dynamic> queueBottomSheet({
     required Widget widget,
+    int closeAfter = 0,
   }) async {
     // Create the bottom sheet queue item
     final completer = Completer<dynamic>();
     final queueItem = BottomSheetQueueItem(
       widget: widget,
       completer: completer,
+      closeAfter: closeAfter,
     );
 
     // If the current sheet it null, set it to the queue item

diff --git a/example/wallet/lib/dependencies/bottom_sheet/i_bottom_sheet_service.dart b/example/wallet/lib/dependencies/bottom_sheet/i_bottom_sheet_service.dart
@@ -5,17 +5,22 @@ import 'package:flutter/material.dart';
 class BottomSheetQueueItem {
   final Widget widget;
   final Completer<dynamic> completer;
+  final int closeAfter;
 
   BottomSheetQueueItem({
     required this.widget,
     required this.completer,
+    this.closeAfter = 0,
   });
 }
 
 abstract class IBottomSheetService {
   abstract final ValueNotifier<BottomSheetQueueItem?> currentSheet;
 
-  Future<dynamic> queueBottomSheet({required Widget widget});
+  Future<dynamic> queueBottomSheet({
+    required Widget widget,
+    int closeAfter = 0,
+  });
 
   void showNext();
 }