From 5f77f2a73f15cce9a31b0c478e3eb6c256a576ac Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 10 Mar 2023 07:58:15 +1100
Subject: [PATCH] Fixes for FROM address

---
 VERSION.txt                          | 2 +-
 app/Services/Email/EmailDefaults.php | 2 +-
 config/ninja.php                     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index f7b8d4c4c074..339c435943b5 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.84
\ No newline at end of file
+5.5.85
\ No newline at end of file
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index d90ede9e6154..e37de7e6b64c 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -134,7 +134,7 @@ class EmailDefaults
             return $this;
         }
 
-        $this->email->email_object->from = new Address($this->email->company->owner()->email, $this->email->company->owner()->name());
+        $this->email->email_object->from = new Address(config('mail.from.address'), config('mail.from.name'));
 
         return $this;
     }
diff --git a/config/ninja.php b/config/ninja.php
index 59b1366a1a03..bf48b77ba509 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.84',
-    'app_tag' => '5.5.84',
+    'app_version' => '5.5.85',
+    'app_tag' => '5.5.85',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),