fix: update did copy (#251)

TBD54566975 · Jul 30, 2024 · 8557b8f · 8557b8f
1 parent 3298b03
commit 8557b8f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/lib/features/account/account_page.dart b/lib/features/account/account_page.dart
@@ -7,7 +7,7 @@ import 'package:didpay/features/pfis/pfis_add_page.dart';
 import 'package:didpay/features/pfis/pfis_notifier.dart';
 import 'package:didpay/features/vcs/vcs_notifier.dart';
 import 'package:didpay/l10n/app_localizations.dart';
-import 'package:didpay/shared/modal/modal_remove_item.dart';
+import 'package:didpay/shared/modal/modal_manage_item.dart';
 import 'package:didpay/shared/theme/grid.dart';
 import 'package:didpay/shared/tile_container.dart';
 import 'package:flutter/material.dart';
@@ -146,7 +146,7 @@ class AccountPage extends HookConsumerWidget {
           ),
           child: const Center(child: Icon(Icons.account_balance)),
         ),
-        onTap: () => ModalRemoveItem.show(
+        onTap: () => ModalManageItem.show(
           context,
           pfi.did,
           Loc.of(context).removePfi,
@@ -229,7 +229,7 @@ class AccountPage extends HookConsumerWidget {
           ),
           child: const Center(child: Icon(Icons.gpp_good)),
         ),
-        onTap: () => ModalRemoveItem.show(
+        onTap: () => ModalManageItem.show(
           context,
           _getCredentialTitle(credential),
           Loc.of(context).removeCredential,

diff --git a/lib/features/did/did_qr_code_page.dart b/lib/features/did/did_qr_code_page.dart
@@ -66,19 +66,15 @@ class DidQrCodePage extends HookConsumerWidget {
                     trailing: IconButton(
                       icon: const Icon(Icons.copy),
                       onPressed: () async {
-                        final didJson = await ref
-                            .read(didServiceProvider)
-                            .getPortableDidJson();
+                        final did = ref.read(didProvider);
                         await Clipboard.setData(
-                          ClipboardData(
-                            text: didJson ?? 'Error: portable did not found',
-                          ),
+                          ClipboardData(text: did.uri),
                         );
                         if (context.mounted) {
                           ScaffoldMessenger.of(context).showSnackBar(
                             SnackBar(
                               content: Text(
-                                'Copied portable did',
+                                Loc.of(context).copiedToClipboard,
                                 style: Theme.of(context)
                                     .textTheme
                                     .titleSmall

diff --git a/lib/features/did/did_storage_service.dart b/lib/features/did/did_storage_service.dart
@@ -34,10 +34,6 @@ class DidStorageService {
     return did;
   }
 
-  // TODO(ethan-tbd): remove portable did method
-  Future<String?> getPortableDidJson() async =>
-      storage.read(key: Constants.portableDidKey);
-
   Future<BearerDid> regenerateDid() async {
     await storage.delete(key: Constants.portableDidKey);
 

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -171,5 +171,6 @@
     "areYouSure": "Are you sure?",
     "allOfYourCredentialsWillAlsoBeDeleted": "All of your credentials will also be deleted",
     "regenerate": "Regenerate",
-    "goBack": "Go back"
+    "goBack": "Go back",
+    "copiedToClipboard": "Copied to clipboard"
 }
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
@@ -894,6 +894,12 @@ abstract class Loc {
   /// In en, this message translates to:
   /// **'Go back'**
   String get goBack;
+
+  /// No description provided for @copiedToClipboard.
+  ///
+  /// In en, this message translates to:
+  /// **'Copied to clipboard'**
+  String get copiedToClipboard;
 }
 
 class _LocDelegate extends LocalizationsDelegate<Loc> {

diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
@@ -415,4 +415,7 @@ class LocEn extends Loc {
 
   @override
   String get goBack => 'Go back';
+
+  @override
+  String get copiedToClipboard => 'Copied to clipboard';
 }
diff --git a/lib/shared/modal/modal_remove_item.dart → lib/shared/modal/modal_manage_item.dart b/lib/shared/modal/modal_remove_item.dart → lib/shared/modal/modal_manage_item.dart
@@ -3,7 +3,7 @@ import 'package:didpay/shared/theme/grid.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-class ModalRemoveItem {
+class ModalManageItem {
   static Future<dynamic> show(
     BuildContext context,
     String title,
@@ -29,7 +29,7 @@ class ModalRemoveItem {
                       ScaffoldMessenger.of(context).showSnackBar(
                         SnackBar(
                           content: Text(
-                            'Copied to clipboard',
+                            Loc.of(context).copiedToClipboard,
                             style: Theme.of(context)
                                 .textTheme
                                 .titleSmall