From e50aeefbfa0c7d0669c7e2e8704bd23c9b1d3483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Mon, 30 Jun 2025 15:49:56 +0200
Subject: [PATCH] Fix FLEXIAPI-340 Fix the space resolution when getting the
 realm on Accounts

---
 CHANGELOG.md             | 2 ++
 flexiapi/app/Account.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ed66a0..57f8411 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,8 @@ v2.0
 - Fix FLEXIAPI-336 Fix broken ph icons
 - Fix FLEXIAPI-333 Remove HTML buttons because they cannot be rendered in "old" Outlook versions
 - Fix FLEXIAPI-337 Generate the provisioning URLs based on the user space
+- Fix FLEXIAPI-326 Rework email templates and translations
+- Fix FLEXIAPI-340 Fix the space resolution when getting the realm on Accounts
 
 v1.6
 ----
diff --git a/flexiapi/app/Account.php b/flexiapi/app/Account.php
index 3a60ee5..cbd3715 100644
--- a/flexiapi/app/Account.php
+++ b/flexiapi/app/Account.php
@@ -322,12 +322,12 @@ class Account extends Authenticatable
 
     public function getRealmAttribute()
     {
-        return space()?->account_realm;
+        return $this->space->account_realm;
     }
 
     public function getResolvedRealmAttribute()
     {
-        return space()?->account_realm ?? $this->domain;
+        return $this->space->account_realm ?? $this->domain;
     }
 
     public function getConfirmationKeyExpiresAttribute()