From 9ffa9c32f5c3db74df7dd831e34ee796144b8bab Mon Sep 17 00:00:00 2001
From: Alex Kontos <MrAlex94@users.noreply.github.com>
Date: Thu, 14 Jul 2022 15:19:23 +0100
Subject: [PATCH] feat: add addon version to about:addons list view and improve
 AddonOptions update method to handle missing updateInstall

---
 toolkit/mozapps/extensions/content/aboutaddons.html | 4 ++++
 toolkit/mozapps/extensions/content/aboutaddons.js   | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html
index 8232f18c7a03..bad130e75f10 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.html
+++ b/toolkit/mozapps/extensions/content/aboutaddons.html
@@ -401,6 +401,10 @@
           <img class="card-heading-icon addon-icon" alt="" />
           <div class="card-contents">
             <div class="addon-name-container">
+              <!-- WATERFOX -->
+              <div class="addon-name">
+                <div class="addon-version-number"></div>
+              </div>
               <a
                 class="addon-badge addon-badge-recommended"
                 is="moz-support-link"
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js
index 4763221e86eb..05d032b8b39e 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.js
+++ b/toolkit/mozapps/extensions/content/aboutaddons.js
@@ -1591,8 +1591,10 @@ class AddonOptions extends HTMLElement {
   }
 
   update(card, addon, updateInstall) {
+    // Be robust if callers don't pass updateInstall: derive it from the addon.
+    const effectiveUpdateInstall = updateInstall || getUpdateInstall(addon);
     for (let el of this.items) {
-      this.setElementState(el, card, addon, updateInstall);
+      this.setElementState(el, card, addon, effectiveUpdateInstall);
     }
 
     // Update the separators visibility based on the updated visibility
@@ -3016,6 +3018,10 @@ class AddonCard extends HTMLElement {
     }
     nameContainer.prepend(nameHeading);
 
+    // WATERFOX
+    let collapsedVersion = this.card.querySelector(".addon-version-number");
+    collapsedVersion.textContent = addon.version;
+
     let panelType = addon.type == "plugin" ? "plugin-options" : "addon-options";
     this.options = document.createElement(panelType);
     this.options.render();