Merge branch 'main' into admin-billing

assets/javascripts/discourse/helpers/user-viewing-self.js

@@ -1,10 +1,11 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
+import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
-import User from "discourse/models/user";
 
 export default registerUnbound("user-viewing-self", function (model) {
-  if (User.current()) {
+  let currentUser = helperContext().currentUser;
+  if (currentUser) {
     return (
-      User.current().username.toLowerCase() === model.username.toLowerCase()
+      currentUser.admin ||
+      currentUser.username?.toLowerCase() === model.username?.toLowerCase()
     );
   }
 

assets/javascripts/discourse/routes/user-billing.js

@@ -4,10 +4,13 @@ export default Route.extend({
   templateName: "user/billing",
 
   setupController(controller, model) {
-    if (this.currentUser.id !== this.modelFor("user").id) {
+    if (
-      this.replaceWith("userActivity");
+      this.currentUser.admin ||
-    } else {
+      this.currentUser.id === this.modelFor("user").id
+    ) {
       controller.setProperties({ model });
+    } else {
+      this.replaceWith("userActivity");
     }
   },
 });