From c686239e546c5c0d10240c98b5cdf150729eff68 Mon Sep 17 00:00:00 2001
From: Max <41635752+mkarolin@users.noreply.github.com>
Date: Thu, 17 Nov 2022 15:32:44 -0500
Subject: [PATCH] Merge pull request #15977 from brave/maxk-fix-ipns-keys-page

[Cr108 Follow up] Fixes 3-dots menu on IPNS keys settings page.
---
 .../brave_ipfs_page/p2p_keys_subpage.html     | 26 +++++++++----------
 .../brave_ipfs_page/p2p_keys_subpage.ts       |  4 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html
index 81bb11b1fd91..57fd87256888 100644
--- a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html
+++ b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html
@@ -80,24 +80,24 @@
                               hidden="[[isDefaultKey_(item.name)]]">
               </cr-icon-button>
             </div>
-            <cr-lazy-render id="keyMenu">
-              <template>
-                <cr-action-menu role-description="$i18n{menu}">
-                  <button class="dropdown-item" on-click="onExportTap_">
-                    $i18n{ipfsKeyExport}
-                  </button>
-                  <button class="dropdown-item" id="remove"
-                      on-click="onKeyDeleteTapped_">
-                    $i18n{ipfsKeyRemove}
-                  </button>
-                </cr-action-menu>
-              </template>
-            </cr-lazy-render>
           </div>
         </template>
       </iron-list>
     </div>
   </div>
+  <cr-lazy-render id="keyMenu">
+    <template>
+      <cr-action-menu role-description="$i18n{menu}">
+        <button class="dropdown-item" on-click="onExportTap_">
+          $i18n{ipfsKeyExport}
+        </button>
+        <button class="dropdown-item" id="remove"
+          on-click="onKeyDeleteTapped_">
+          $i18n{ipfsKeyRemove}
+        </button>
+      </cr-action-menu>
+    </template>
+  </cr-lazy-render>
 </div>
 <template is="dom-if" if="[[showAddp2pKeyDialog_]]" restamp>
   <add-p2p-key-dialog keys="[[keys]]" on-close="onAddKeyDialogClosed_">
diff --git a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts
index 6552fb485d67..b3023578070e 100644
--- a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts
+++ b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts
@@ -238,8 +238,8 @@ export class SettingsBraveP2pKeysSubpageElement extends SettingsBraveP2pKeysSubp
     this.actionItemName = ""
   }
 
-  onKeyMenuTapped_(event: Event) {
-    this.actionItemName = (event.target as HTMLElement).getAttribute('itemName')!;
+  onKeyMenuTapped_(event: DomRepeatEvent<KeysListItem>) {
+    this.actionItemName = event.model.item.name;
     const actionMenu = this.$.keyMenu.get();
     actionMenu.showAt(event.target as HTMLElement);
   }