fixed lint errors

WalletConnect · Oct 17, 2023 · 762ec18 · 762ec18
1 parent 9051c01
commit 762ec18
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 64 deletions.
diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
@@ -60,7 +60,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
   Future<void> initialize() async {
     // try {
-    print('Project ID: ${DartDefines.projectId}');
+    debugPrint('Project ID: ${DartDefines.projectId}');
     _web3App = await Web3App.createInstance(
       projectId: DartDefines.projectId,
       logLevel: LogLevel.info,

diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
@@ -73,7 +73,12 @@ class ConnectPageState extends State<ConnectPage> {
           vertical: StyleConstants.linear8,
         ),
         child: ElevatedButton(
-          onPressed: () => _onConnect(_selectedChains),
+          onPressed: () => _onConnect(
+            _selectedChains,
+            showToast: (m) async {
+              await showPlatformToast(child: Text(m), context: context);
+            },
+          ),
           style: ButtonStyle(
             backgroundColor: MaterialStateProperty.all<Color>(
               StyleConstants.primaryColor,
@@ -155,9 +160,8 @@ class ConnectPageState extends State<ConnectPage> {
     );
   }
 
-  Future<void> _onConnect(
-    List<ChainMetadata> chains,
-  ) async {
+  Future<void> _onConnect(List<ChainMetadata> chains,
+      {Function(String message)? showToast}) async {
     // Use the chain metadata to build the required namespaces:
     // Get the methods, get the events
     final Map<String, RequiredNamespace> requiredNamespaces = {};
@@ -192,12 +196,7 @@ class ConnectPageState extends State<ConnectPage> {
       final _ = await res.session.future;
       // print(sessionData);
 
-      showPlatformToast(
-        child: const Text(
-          StringConstants.connectionEstablished,
-        ),
-        context: context,
-      );
+      showToast?.call(StringConstants.connectionEstablished);
 
       // Send off an auth request now that the pairing/session is established
       debugPrint('Requesting authentication');
@@ -216,19 +215,9 @@ class ConnectPageState extends State<ConnectPage> {
 
       if (authResponse.error != null) {
         debugPrint('Authentication failed: ${authResponse.error}');
-        await showPlatformToast(
-          child: const Text(
-            StringConstants.authFailed,
-          ),
-          context: context,
-        );
+        showToast?.call(StringConstants.authFailed);
       } else {
-        showPlatformToast(
-          child: const Text(
-            StringConstants.authSucceeded,
-          ),
-          context: context,
-        );
+        showToast?.call(StringConstants.authSucceeded);
       }
 
       if (_shouldDismissQrCode) {
@@ -241,12 +230,7 @@ class ConnectPageState extends State<ConnectPage> {
         // ignore: use_build_context_synchronously
         Navigator.pop(context);
       }
-      await showPlatformToast(
-        child: const Text(
-          StringConstants.connectionFailed,
-        ),
-        context: context,
-      );
+      showToast?.call(StringConstants.connectionFailed);
     }
   }
 
@@ -279,17 +263,18 @@ class ConnectPageState extends State<ConnectPage> {
                     height: StyleConstants.linear16,
                   ),
                   ElevatedButton(
-                    onPressed: () async {
-                      await Clipboard.setData(
+                    onPressed: () {
+                      Clipboard.setData(
                         ClipboardData(
                           text: response.uri!.toString(),
                         ),
-                      );
-                      await showPlatformToast(
-                        child: const Text(
-                          StringConstants.copiedToClipboard,
+                      ).then(
+                        (_) => showPlatformToast(
+                          child: const Text(
+                            StringConstants.copiedToClipboard,
+                          ),
+                          context: context,
                         ),
-                        context: context,
                       );
                     },
                     child: const Text(

diff --git a/example/dapp/lib/widgets/method_dialog.dart b/example/dapp/lib/widgets/method_dialog.dart
@@ -48,36 +48,25 @@ class MethodDialogState extends State<MethodDialog> {
           if (snapshot.hasData) {
             final String t = jsonEncode(snapshot.data);
             return InkWell(
-              onTap: () async {
-                await Clipboard.setData(
-                  ClipboardData(
-                    text: t,
+              onTap: () {
+                Clipboard.setData(ClipboardData(text: t)).then(
+                  (_) => showPlatformToast(
+                    child: const Text(StringConstants.copiedToClipboard),
+                    context: context,
                   ),
                 );
-                showPlatformToast(
-                  child: const Text(
-                    StringConstants.copiedToClipboard,
-                  ),
-                  context: context,
-                );
               },
-              child: Text(
-                t,
-              ),
+              child: Text(t),
             );
           } else if (snapshot.hasError) {
             return InkWell(
-              onTap: () async {
-                await Clipboard.setData(
-                  ClipboardData(
-                    text: snapshot.data.toString(),
-                  ),
-                );
-                showPlatformToast(
-                  child: const Text(
-                    StringConstants.copiedToClipboard,
+              onTap: () {
+                Clipboard.setData(ClipboardData(text: snapshot.data.toString()))
+                    .then(
+                  (_) => showPlatformToast(
+                    child: const Text(StringConstants.copiedToClipboard),
+                    context: context,
                   ),
-                  context: context,
                 );
               },
               child: Text(

diff --git a/example/wallet/lib/dependencies/chains/evm_service.dart b/example/wallet/lib/dependencies/chains/evm_service.dart
@@ -247,24 +247,24 @@ class EVMService extends IChain {
     final transaction = Transaction(
       from: EthereumAddress.fromHex(ethTransaction.from),
       to: EthereumAddress.fromHex(ethTransaction.to),
-      value: EtherAmount.fromUnitAndValue(
+      value: EtherAmount.fromBigInt(
         EtherUnit.wei,
         BigInt.tryParse(ethTransaction.value) ?? BigInt.zero,
       ),
       gasPrice: ethTransaction.gasPrice != null
-          ? EtherAmount.fromUnitAndValue(
+          ? EtherAmount.fromBigInt(
               EtherUnit.wei,
               BigInt.tryParse(ethTransaction.gasPrice!) ?? BigInt.zero,
             )
           : null,
       maxFeePerGas: ethTransaction.maxFeePerGas != null
-          ? EtherAmount.fromUnitAndValue(
+          ? EtherAmount.fromBigInt(
               EtherUnit.wei,
               BigInt.tryParse(ethTransaction.maxFeePerGas!) ?? BigInt.zero,
             )
           : null,
       maxPriorityFeePerGas: ethTransaction.maxPriorityFeePerGas != null
-          ? EtherAmount.fromUnitAndValue(
+          ? EtherAmount.fromBigInt(
               EtherUnit.wei,
               BigInt.tryParse(ethTransaction.maxPriorityFeePerGas!) ??
                   BigInt.zero,

diff --git a/example/wallet/lib/main.dart b/example/wallet/lib/main.dart
@@ -39,7 +39,7 @@ class MyApp extends StatelessWidget {
     const nearWhite = Color(0xFFE0E0E0);
 
     return baseTheme.copyWith(
-      backgroundColor: Colors.black,
+      colorScheme: ColorScheme.fromSeed(seedColor: Colors.black),
       scaffoldBackgroundColor: Colors.black,
       textTheme: baseTheme.textTheme.apply(
         bodyColor: nearWhite,