chore: did qr feature (#155)

ethanwlee · web-flow · commit 89c3396245e3 · 2024-05-15T10:49:22.000-07:00
diff --git a/lib/features/did_qr/did_qr.dart b/lib/features/did_qr/did_qr.dart
@@ -0,0 +1,70 @@
+import 'package:didpay/features/did_qr/did_qr_scan_page.dart';
+import 'package:didpay/l10n/app_localizations.dart';
+import 'package:didpay/shared/theme/grid.dart';
+import 'package:flutter/material.dart';
+import 'package:web5/web5.dart';
+
+class DidQr {
+  static Widget buildScanTile(
+    BuildContext context,
+    String title,
+    TextEditingController didTextController,
+    ValueNotifier<String?> errorText, {
+    required bool isPhysicalDevice,
+  }) =>
+      Padding(
+        padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
+        child: ListTile(
+          leading: const Icon(Icons.qr_code),
+          title: Text(
+            title,
+            style: Theme.of(context).textTheme.bodyMedium,
+          ),
+          trailing: const Icon(Icons.chevron_right),
+          onTap: () => isPhysicalDevice
+              ? _scanQrCode(
+                  context,
+                  didTextController,
+                  errorText,
+                  Loc.of(context).noDidQrCodeFound,
+                )
+              : _simulateScanQrCode(
+                  context,
+                  didTextController,
+                ),
+        ),
+      );
+
+  static Future<bool> _isValidDid(String did) async {
+    final result = await DidResolver.resolve(did);
+    return !result.hasError();
+  }
+
+  static Future<void> _scanQrCode(
+    BuildContext context,
+    TextEditingController didTextController,
+    ValueNotifier<String?> errorText,
+    String errorMessage,
+  ) async {
+    final qrValue = await Navigator.of(context).push<String>(
+      MaterialPageRoute(builder: (context) => const DidQrScanPage()),
+    );
+
+    final isValid = qrValue != null && await _isValidDid(qrValue);
+    didTextController.text = isValid ? qrValue : '';
+    errorText.value = isValid ? null : errorMessage;
+  }
+
+  static Future<void> _simulateScanQrCode(
+    BuildContext context,
+    TextEditingController didTextController,
+  ) async {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(Loc.of(context).simulatedQrCodeScan),
+      ),
+    );
+    final did = await DidDht.create(publish: true);
+    didTextController.text = did.uri;
+  }
+}
diff --git a/lib/features/did_qr/did_qr_scan_page.dart b/lib/features/did_qr/did_qr_scan_page.dart
@@ -5,8 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
 
-class ScanQrPage extends HookWidget {
-  const ScanQrPage({super.key});
+class DidQrScanPage extends HookWidget {
+  const DidQrScanPage({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/features/pfis/pfi_page.dart b/lib/features/pfis/pfi_page.dart
@@ -1,8 +1,9 @@
 import 'dart:convert';
+
+import 'package:didpay/features/did_qr/did_qr_scan_page.dart';
 import 'package:didpay/features/onboarding/agreement_page.dart';
 import 'package:didpay/features/pfis/pfi.dart';
 import 'package:didpay/features/pfis/pfis_notifier.dart';
-import 'package:didpay/features/send/scan_qr_page.dart';
 import 'package:didpay/l10n/app_localizations.dart';
 import 'package:didpay/shared/theme/grid.dart';
 import 'package:flutter/material.dart';
@@ -103,7 +104,8 @@ class PfiPage extends HookConsumerWidget {
                 onPressed: () async {
                   final scannedJson = await Navigator.push<String>(
                     context,
-                    MaterialPageRoute(builder: (context) => const ScanQrPage()),
+                    MaterialPageRoute(
+                        builder: (context) => const DidQrScanPage()),
                   );
                   if (scannedJson != null) {
                     try {
diff --git a/lib/features/send/send_did_page.dart b/lib/features/send/send_did_page.dart
@@ -1,6 +1,5 @@
-import 'package:didpay/features/account/account_providers.dart';
 import 'package:didpay/features/device/device_info_service.dart';
-import 'package:didpay/features/send/scan_qr_page.dart';
+import 'package:didpay/features/did_qr/did_qr.dart';
 import 'package:didpay/features/send/send_confirmation_page.dart';
 import 'package:didpay/l10n/app_localizations.dart';
 import 'package:didpay/shared/theme/grid.dart';
@@ -17,20 +16,17 @@ class SendDidPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final did = ref.watch(didProvider);
-
     final focusNode = useFocusNode();
     final isPhysicalDevice = useState(true);
     final errorText = useState<String?>(null);
     final recipientDidController = useTextEditingController();
 
     useEffect(
       () {
-        Future.microtask(() async {
-          isPhysicalDevice.value =
-              await ref.read(deviceInfoServiceProvider).isPhysicalDevice();
-        });
-
+        Future.microtask(
+          () async => isPhysicalDevice.value =
+              await ref.read(deviceInfoServiceProvider).isPhysicalDevice(),
+        );
         return null;
       },
       [],
@@ -48,12 +44,12 @@ class SendDidPage extends HookConsumerWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.stretch,
                   children: [
-                    _buildScanQr(
+                    DidQr.buildScanTile(
                       context,
+                      Loc.of(context).scanRecipientQrCode,
                       recipientDidController,
                       errorText,
-                      isPhysicalDevice,
-                      did.uri,
+                      isPhysicalDevice: isPhysicalDevice.value,
                     ),
                     _buildForm(
                       context,
@@ -68,7 +64,6 @@ class SendDidPage extends HookConsumerWidget {
             ),
             _buildSendButton(
               context,
-              did.uri,
               recipientDidController.text,
               errorText.value,
             ),
@@ -134,40 +129,8 @@ class SendDidPage extends HookConsumerWidget {
         ),
       );
 
-  Widget _buildScanQr(
-    BuildContext context,
-    TextEditingController recipientDidController,
-    ValueNotifier<String?> errorText,
-    ValueNotifier<bool> isPhysicalDevice,
-    String did,
-  ) =>
-      Padding(
-        padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-        child: ListTile(
-          leading: const Icon(Icons.qr_code),
-          title: Text(
-            Loc.of(context).scanQrCode,
-            style: Theme.of(context).textTheme.bodyMedium,
-          ),
-          trailing: const Icon(Icons.chevron_right),
-          onTap: () => isPhysicalDevice.value
-              ? _scanQrCode(
-                  context,
-                  recipientDidController,
-                  errorText,
-                  Loc.of(context).noDidQrCodeFound,
-                )
-              : _simulateScanQrCode(
-                  context,
-                  recipientDidController,
-                  did,
-                ),
-        ),
-      );
-
   Widget _buildSendButton(
     BuildContext context,
-    String senderDid,
     String recipientDid,
     String? errorText,
   ) {
@@ -181,7 +144,7 @@ class SendDidPage extends HookConsumerWidget {
               context,
               MaterialPageRoute(
                 builder: (context) => SendConfirmationPage(
-                  did: senderDid,
+                  did: recipientDid,
                   amount: sendAmount,
                 ),
               ),
@@ -197,33 +160,4 @@ class SendDidPage extends HookConsumerWidget {
     final result = await DidResolver.resolve(did);
     return !result.hasError();
   }
-
-  Future<void> _scanQrCode(
-    BuildContext context,
-    TextEditingController recipientDidController,
-    ValueNotifier<String?> errorText,
-    String errorMessage,
-  ) async {
-    // ignore: use_build_context_synchronously
-    final qrValue = await Navigator.of(context).push<String>(
-      MaterialPageRoute(builder: (context) => const ScanQrPage()),
-    );
-
-    final isValid = qrValue != null && await _isValidDid(qrValue);
-    recipientDidController.text = isValid ? qrValue : '';
-    errorText.value = isValid ? null : errorMessage;
-  }
-
-  void _simulateScanQrCode(
-    BuildContext context,
-    TextEditingController recipientDidController,
-    String did,
-  ) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        content: Text(Loc.of(context).simulatedQrCodeScan),
-      ),
-    );
-    recipientDidController.text = did;
-  }
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -8,7 +8,7 @@
     "deposit": "Deposit",
     "send": "Send",
     "to": "To:",
-    "scanQrCode": "Don't know the recipient's DID? Scan their QR code",
+    "scanRecipientQrCode": "Don't know the recipient's DID? Scan their QR code",
     "withdraw": "Withdraw",
     "next": "Next",
     "accountBalance": "Account balance",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
@@ -145,11 +145,11 @@ abstract class Loc {
   /// **'To:'**
   String get to;
 
-  /// No description provided for @scanQrCode.
+  /// No description provided for @scanRecipientQrCode.
   ///
   /// In en, this message translates to:
   /// **'Don\'t know the recipient\'s DID? Scan their QR code'**
-  String get scanQrCode;
+  String get scanRecipientQrCode;
 
   /// No description provided for @withdraw.
   ///
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
@@ -32,7 +32,7 @@ class LocEn extends Loc {
   String get to => 'To:';
 
   @override
-  String get scanQrCode => 'Don\'t know the recipient\'s DID? Scan their QR code';
+  String get scanRecipientQrCode => 'Don\'t know the recipient\'s DID? Scan their QR code';
 
   @override
   String get withdraw => 'Withdraw';
diff --git a/test/features/send/send_did_page_test.dart b/test/features/send/send_did_page_test.dart
@@ -48,30 +48,5 @@ void main() async {
 
       expect(find.widgetWithText(FilledButton, 'Send 25 USDC'), findsOneWidget);
     });
-
-    testWidgets(
-        'should show enabled send button when while recipient DID is set',
-        (tester) async {
-      await tester.pumpWidget(
-        WidgetHelpers.testableWidget(
-          child: SendDidPage(sendAmount: '25'),
-          overrides: [
-            didProvider.overrideWithValue(did),
-          ],
-        ),
-      );
-
-      await tester.tap(
-        find.text("Don't know the recipient's DID? Scan their QR code"),
-      );
-      await tester.pumpAndSettle();
-
-      final sendButton = find.widgetWithText(FilledButton, 'Send 25 USDC');
-
-      expect(
-        tester.widget<FilledButton>(sendButton).onPressed,
-        isNotNull,
-      );
-    });
   });
 }
