Multi Account Support & Some Bugfixes

aryanA101a · Jul 4, 2023 · b33c5bb · b33c5bb
1 parent 6682bb3
commit b33c5bb
Show file tree

Hide file tree

Showing 14 changed files with 686 additions and 248 deletions.
diff --git a/lib/exceptions/app_exceptions.dart b/lib/exceptions/app_exceptions.dart
@@ -1,4 +1,4 @@
-enum AppEType { somethingElse, empty }
+enum AppEType { somethingElse, empty, importAccount }
 
 class AppException {
   AppException(this.eType) : _message = _setMessage(eType);
@@ -13,6 +13,8 @@ class AppException {
         return "Empty";
       case AppEType.somethingElse:
         return "Something went wrong!";
+      case AppEType.importAccount:
+        return "Cannot import account!";
     }
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -4,7 +4,9 @@ import 'package:batua/pages/onboardingPage.dart';
 import 'package:batua/pages/tokenInfoPage.dart';
 import 'package:batua/pages/transactionHistoryPage.dart';
 import 'package:batua/pages/transactionPage.dart';
+import 'package:batua/services/account_service.dart';
 import 'package:batua/ui_helper/homePageUiHelper.dart';
+import 'package:batua/ui_helper/onboarding_page_ui_helper.dart';
 import 'package:batua/ui_helper/transaction_history_page_ui_helper.dart';
 import 'package:batua/ui_helper/transaction_page_ui_helper.dart';
 import 'package:batua/utils/utils.dart';
@@ -25,7 +27,7 @@ void main() async {
   );
 
   WidgetsFlutterBinding.ensureInitialized();
-  bool loggedIn = await isLogged();
+  bool loggedIn = await AccountService.isLogged();
   runApp(MyApp(loggedIn: loggedIn));
 }
 
@@ -35,24 +37,31 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      scaffoldMessengerKey: rootScaffoldMessengerKey,
-      title: "Batua",
-      initialRoute: loggedIn ? HomePage.route : OnboardingPage.route,
-      routes: {
-        "/": (context) => const OnboardingPage(),
-        "/home": (context) => ChangeNotifierProvider(
-              create: (context) => getIt<HomePageUiHelper>(),
-              child: const HomePage(),
-            ),
-        "/tokenInfoPage": (context) => const TokenInfoPage(),
-        "/transactionHistory": (context) => ChangeNotifierProvider(
-            create: (context) => TransactionHistoryPageUiHelper(),
-            child: const TransactionHistoryPage()),
-        "/transactionPage": (context) => ChangeNotifierProvider(
-            create: (context) => TransactionPageUiHelper(),
-            child: const TransactionPage()),
-      },
-    );
+    return ChangeNotifierProvider(
+        create: (context) => OnboardingPageUiHelper(),
+        child: MaterialApp(
+          scaffoldMessengerKey: rootScaffoldMessengerKey,
+          title: "Batua",
+          home: loggedIn
+              ? ChangeNotifierProvider(
+                  create: (context) => getIt<HomePageUiHelper>(),
+                  child: const HomePage(),
+                )
+              : OnboardingPage(),
+          routes: {
+            "/onboardingPage": (context) => const OnboardingPage(),
+            "/homePage": (context) => ChangeNotifierProvider(
+                  create: (context) => getIt<HomePageUiHelper>(),
+                  child: const HomePage(),
+                ),
+            "/tokenInfoPage": (context) => const TokenInfoPage(),
+            "/transactionHistory": (context) => ChangeNotifierProvider(
+                create: (context) => TransactionHistoryPageUiHelper(),
+                child: const TransactionHistoryPage()),
+            "/transactionPage": (context) => ChangeNotifierProvider(
+                create: (context) => TransactionPageUiHelper(),
+                child: const TransactionPage()),
+          },
+        ));
   }
 }
diff --git a/lib/models/mined_transaction_model.dart b/lib/models/mined_transaction_model.dart
@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:web3dart/crypto.dart';
+
 class MinedTransactionModel {
   final String jsonrpc;
   final String method;
@@ -128,15 +130,15 @@ class MinedTransaction {
       MinedTransaction(
         blockHash: json["blockHash"],
         blockNumber: json["blockNumber"],
-        from: json["from"].substring(2),
+        from: strip0x(json["from"]),
         gas: json["gas"],
         gasPrice: json["gasPrice"],
         maxFeePerGas: json["maxFeePerGas"],
         maxPriorityFeePerGas: json["maxPriorityFeePerGas"],
         hash: json["hash"],
         input: json["input"],
         nonce: json["nonce"],
-        to: json["to"].substring(2),
+        to: strip0x(json["to"]),
         transactionIndex: json["transactionIndex"],
         value: json["value"],
         type: json["type"],

diff --git a/lib/models/transaction_model.dart b/lib/models/transaction_model.dart
@@ -5,6 +5,8 @@
 import 'dart:convert';
 import 'dart:math';
 
+import 'package:web3dart/crypto.dart';
+
 class TransactionModel {
   final String status;
   final String message;
@@ -97,8 +99,8 @@ class TransactionModelResult {
         nonce: json["nonce"],
         blockHash: json["blockHash"],
         transactionIndex: json["transactionIndex"],
-        from: json["from"].substring(2),
-        to: json["to"].substring(2),
+        from:strip0x( json["from"]),
+        to: strip0x(json["to"]),
         value: json["tokenDecimal"] == null
             ? BigInt.parse(json["value"]) / BigInt.from(pow(10, 18))
             : BigInt.parse(json["value"]) /

diff --git a/lib/pages/homePage.dart b/lib/pages/homePage.dart
@@ -1,5 +1,6 @@
 import 'dart:developer';
 
+import 'package:batua/di/locator.dart';
 import 'package:batua/main.dart';
 import 'package:batua/models/token.dart';
 import 'package:batua/pages/tokenInfoPage.dart';
@@ -21,37 +22,31 @@ import 'package:shimmer/shimmer.dart';
 import 'onboardingPage.dart';
 
 class HomePage extends StatelessWidget {
-  static const route = "/home";
+  static const route = "/homePage";
   const HomePage({super.key});
 
   @override
   Widget build(BuildContext context) {
     // var provider = Provider.of<HomePageUiHelper>(context);
-    return WillPopScope(
-      onWillPop: () async {
-        SystemNavigator.pop();
-        return false;
-      },
-      child: Scaffold(
-          body: SafeArea(
-        child: Column(
-          children: [
-            Container(
-              height: MediaQuery.sizeOf(context).height * (1 / 3),
-              child: const Column(
-                children: [
-                  TopBar(),
-                  Expanded(child: WalletInfo()),
-                ],
-              ),
+    return Scaffold(
+        body: SafeArea(
+      child: Column(
+        children: [
+          Container(
+            height: MediaQuery.sizeOf(context).height * (1 / 3),
+            child: const Column(
+              children: [
+                TopBar(),
+                Expanded(child: WalletInfo()),
+              ],
             ),
-            const Expanded(
-              child: TokensSectionWidget(),
-            )
-          ],
-        ),
-      )),
-    );
+          ),
+          const Expanded(
+            child: TokensSectionWidget(),
+          )
+        ],
+      ),
+    ));
   }
 }
 
@@ -272,13 +267,64 @@ class TopBar extends StatelessWidget {
             },
             icon: Icon(FontAwesomeIcons.fileInvoice,
                 color: Colors.blue.shade800)),
-        IconButton(
-            onPressed: () async {
-              AccountService.deletePrivateKey();
-              Navigator.popAndPushNamed(context, OnboardingPage.route);
+        Padding(
+          padding: const EdgeInsets.only(right: 8, left: 2),
+          child: PopupMenuButton<String>(
+            elevation: 2,
+            shape:
+                RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+            position: PopupMenuPosition.under,
+            child: Icon(
+              Icons.settings_rounded,
+              color: Colors.grey.shade900,
+            ),
+            onSelected: (String value) {
+              switch (value) {
+                case "CopyPrivateKey":
+                  AccountService.retrievePrivateKey(
+                          context.read<HomePageUiHelper>().address!)
+                      .then((value) {
+                    Clipboard.setData(ClipboardData(text: value ?? ""));
+
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text(
+                          'Private key copied!',
+                        ),
+                      ),
+                    );
+                  });
+
+                case "Accounts":
+                  // AccountService.deletePrivateKey();
+                  Navigator.popAndPushNamed(context, OnboardingPage.route);
+              }
             },
-            icon: Icon(FontAwesomeIcons.arrowRightFromBracket,
-                color: Colors.grey.shade900)),
+            itemBuilder: (BuildContext context) {
+              return [
+                ("Copy Private Key", Icons.security_rounded),
+                ("Accounts", Icons.account_circle_rounded)
+              ]
+                  .map(((String, IconData) v) => PopupMenuItem<String>(
+                        value: v.$1.replaceAll(' ', ''),
+                        child: Row(
+                          children: [
+                            Container(
+                              margin: const EdgeInsets.all(8.0),
+                              child: Icon(v.$2),
+                            ),
+                            Text(
+                              v.$1,
+                              overflow: TextOverflow.ellipsis,
+                              style: TextStyle(fontWeight: FontWeight.w500),
+                            ),
+                          ],
+                        ),
+                      ))
+                  .toList();
+            },
+          ),
+        ),
       ],
     );
   }