From a312a2fe9c3eff9da5253a58754cc9d311434187 Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Tue, 6 Dec 2022 21:04:58 +0400 Subject: [PATCH] FIX: profile page is not loading --- .../discourse/app/components/user-status-message.js | 10 +++++----- .../components/user-status-message-test.js | 13 +++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/user-status-message.js b/app/assets/javascripts/discourse/app/components/user-status-message.js index 857cc03039922..e7b7405277475 100644 --- a/app/assets/javascripts/discourse/app/components/user-status-message.js +++ b/app/assets/javascripts/discourse/app/components/user-status-message.js @@ -12,10 +12,10 @@ export default class UserStatusMessage extends Component { return null; } - return until( - this.status.ends_at, - this.currentUser.user_option.timezone, - this.currentUser.locale - ); + const timezone = this.currentUser + ? this.currentUser.timezone + : moment.tz.guess(); + + return until(this.status.ends_at, timezone, this.currentUser?.locale); } } diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js index 82364918ab1b1..15e174b83aa02 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js @@ -141,4 +141,17 @@ module("Integration | Component | user-status-message", function (hooks) { document.querySelector("[data-tippy-root] .user-status-message-tooltip") ); }); + + test("doesn't blow up with an anonymous user", async function (assert) { + this.owner.unregister("service:current-user"); + this.set("status", { + emoji: "tooth", + description: "off to dentist", + ends_at: "2100-02-02T12:30:00.000Z", + }); + + await render(hbs``); + + assert.dom(".user-status-message").exists(); + }); });