From 83a16b7afca92b2d525136f1dc83601995e5861b Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 17 Dec 2024 16:34:46 -0500
Subject: [PATCH 1/2] Fix Copy value button label post-rebase (CFM-31)

---
 app/webroot/js/comanage/components/common/copy-value-button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webroot/js/comanage/components/common/copy-value-button.js b/app/webroot/js/comanage/components/common/copy-value-button.js
index 582dc991..911b2439 100644
--- a/app/webroot/js/comanage/components/common/copy-value-button.js
+++ b/app/webroot/js/comanage/components/common/copy-value-button.js
@@ -69,7 +69,7 @@ export default {
       :aria-label="this.ariaLabel" 
       @click.stop.prevent="copyValue(this.valueToCopy)">
       <span class="material-symbols-outlined">{{ this.copyIcon }}</span>
-      <span class="cm-copy-value-text">{{ this.txt.copy }}</span>
+      <span class="cm-copy-value-text">{{ this.txt['operation.copy'] }}</span>
     </button>
   `
 }

From 5812ebea8b74800151bd7d319177299121a44687 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 17 Dec 2024 16:46:47 -0500
Subject: [PATCH 2/2] Fix email address top-link post-rebase (CFM-31)

---
 app/templates/EmailAddresses/fields-nav.inc | 27 ++++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/templates/EmailAddresses/fields-nav.inc b/app/templates/EmailAddresses/fields-nav.inc
index 5f5666ae..025e0f3e 100644
--- a/app/templates/EmailAddresses/fields-nav.inc
+++ b/app/templates/EmailAddresses/fields-nav.inc
@@ -26,15 +26,18 @@
  */
 
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [
-  [
-    'icon' => 'verified_user',
-    'order' => 'Default',
-    'label' => __d('operation', 'EmailAddresses.verify.force'),
-    'if' => 'notVerified',
-    'link' => [
-      'action' => 'forceVerify',
-      $vv_obj->id
-    ],
-  ];
-];
\ No newline at end of file
+  if($vv_action != 'add') {
+    $topLinks = [
+      [
+        'icon' => 'verified_user',
+        'order' => 'Default',
+        'label' => __d('operation', 'EmailAddresses.verify.force'),
+        'if' => 'notVerified',
+        'link' => [
+          'action' => 'forceVerify',
+          $vv_obj->id
+        ],
+        'class' => ''
+      ],
+    ];
+  }
\ No newline at end of file