From fe53f2cbc0e9d4032860f03b3f4ab878e6869613 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 20 Jun 2025 21:36:54 +0200
Subject: [PATCH] DEV: Clean up helpers (#279)

* remove an unused helper
* move a single-use helper to its call-site as a getter
* convert `format-currency` to a pure function helper
---
 .../discourse/connectors/user-main-nav/billing.gjs | 14 ++++++++++++--
 .../discourse/helpers/format-currency.js           |  8 ++------
 .../discourse/helpers/stripe-payment-link.js       |  7 -------
 .../discourse/helpers/user-viewing-self.js         | 11 -----------
 .../unit/helpers/format-currency-test.js           | 10 +++++-----
 5 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 assets/javascripts/discourse/helpers/stripe-payment-link.js
 delete mode 100644 assets/javascripts/discourse/helpers/user-viewing-self.js

diff --git a/assets/javascripts/discourse/connectors/user-main-nav/billing.gjs b/assets/javascripts/discourse/connectors/user-main-nav/billing.gjs
index 380760d..6fc29ad 100644
--- a/assets/javascripts/discourse/connectors/user-main-nav/billing.gjs
+++ b/assets/javascripts/discourse/connectors/user-main-nav/billing.gjs
@@ -1,15 +1,25 @@
 import Component from "@ember/component";
 import { LinkTo } from "@ember/routing";
+import { service } from "@ember/service";
 import { classNames, tagName } from "@ember-decorators/component";
 import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
-import userViewingSelf from "../../helpers/user-viewing-self";
 
 @tagName("li")
 @classNames("user-main-nav-outlet", "billing")
 export default class Billing extends Component {
+  @service currentUser;
+
+  get viewingSelf() {
+    return (
+      this.currentUser &&
+      this.currentUser.username.toLowerCase() ===
+        this.model.username.toLowerCase()
+    );
+  }
+
   <template>
-    {{#if (userViewingSelf this.model)}}
+    {{#if this.viewingSelf}}
       <LinkTo @route="user.billing">
         {{icon "far-credit-card"}}
         {{i18n "discourse_subscriptions.navigation.billing"}}
diff --git a/assets/javascripts/discourse/helpers/format-currency.js b/assets/javascripts/discourse/helpers/format-currency.js
index d86df08..08dc822 100644
--- a/assets/javascripts/discourse/helpers/format-currency.js
+++ b/assets/javascripts/discourse/helpers/format-currency.js
@@ -1,6 +1,4 @@
-import { helper } from "@ember/component/helper";
-
-export function formatCurrency([currency, amount]) {
+export default function formatCurrency(currency, amount) {
   let currencySign;
 
   switch (currency.toUpperCase()) {
@@ -38,8 +36,6 @@ export function formatCurrency([currency, amount]) {
       currencySign = "$";
   }
 
-  let formattedAmount = parseFloat(amount).toFixed(2);
+  const formattedAmount = parseFloat(amount).toFixed(2);
   return currencySign + formattedAmount;
 }
-
-export default helper(formatCurrency);
diff --git a/assets/javascripts/discourse/helpers/stripe-payment-link.js b/assets/javascripts/discourse/helpers/stripe-payment-link.js
deleted file mode 100644
index cbff457..0000000
--- a/assets/javascripts/discourse/helpers/stripe-payment-link.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Helper from "@ember/component/helper";
-
-export default Helper.helper(function (params) {
-  const payment = params[0];
-
-  return `<a href=\"${payment.url}\">${payment.payment_intent_id}</a>`;
-});
diff --git a/assets/javascripts/discourse/helpers/user-viewing-self.js b/assets/javascripts/discourse/helpers/user-viewing-self.js
deleted file mode 100644
index eda4f44..0000000
--- a/assets/javascripts/discourse/helpers/user-viewing-self.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import User from "discourse/models/user";
-
-export default function userViewingSelf(model) {
-  if (User.current()) {
-    return (
-      User.current().username.toLowerCase() === model.username.toLowerCase()
-    );
-  }
-
-  return false;
-}
diff --git a/test/javascripts/unit/helpers/format-currency-test.js b/test/javascripts/unit/helpers/format-currency-test.js
index 5e5fec0..b47bf52 100644
--- a/test/javascripts/unit/helpers/format-currency-test.js
+++ b/test/javascripts/unit/helpers/format-currency-test.js
@@ -1,17 +1,17 @@
 import { setupTest } from "ember-qunit";
 import { module, test } from "qunit";
-import { formatCurrency } from "discourse/plugins/discourse-subscriptions/discourse/helpers/format-currency";
+import formatCurrency from "discourse/plugins/discourse-subscriptions/discourse/helpers/format-currency";
 
 module("Subscriptions | Unit | Helper | format-currency", function (hooks) {
   setupTest(hooks);
 
-  test("it formats USD correctly", function (assert) {
-    let result = formatCurrency(["USD", 338.2]);
+  test("formats USD correctly", function (assert) {
+    const result = formatCurrency("USD", 338.2);
     assert.equal(result, "$338.20", "Formats USD correctly");
   });
 
-  test("it rounds correctly", function (assert) {
-    let result = formatCurrency(["USD", 338.289]);
+  test("rounds correctly", function (assert) {
+    const result = formatCurrency("USD", 338.289);
     assert.equal(result, "$338.29", "Rounds correctly");
   });
 });