From c9121f6b22e81f46d9d47abb2087e4fa8aad5c1f Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Sun, 12 Sep 2021 14:55:52 +1000
Subject: [PATCH 1/3] Force .foss for OSS release

---
 app/Http/Controllers/BaseController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index f2bfe9d01288..466cd559525f 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -769,6 +769,10 @@ class BaseController extends Controller
             case 'profile':
                 return 'main.profile.dart.js';                                      
             default:
+
+                if(Ninja::isSelfHost())
+                    return 'main.foss.dart.js';
+
                 return 'main.dart.js';
         }
 

From 1a2efecfaa77c6673f823ff169e989c5953f630d Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Sun, 12 Sep 2021 15:29:30 +1000
Subject: [PATCH 2/3] Minor fixes

---
 app/Repositories/ClientContactRepository.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Repositories/ClientContactRepository.php b/app/Repositories/ClientContactRepository.php
index e43539e1d657..eedab840d3de 100644
--- a/app/Repositories/ClientContactRepository.php
+++ b/app/Repositories/ClientContactRepository.php
@@ -73,7 +73,9 @@ class ClientContactRepository extends BaseRepository
                 $client->company->client_contacts()->where('email', $update_contact->email)->update(['password' => $update_contact->password]);
             }
 
-            $update_contact->email = trim($contact['email']);
+            if(array_key_exists('email', $contact))
+                $update_contact->email = trim($contact['email']);
+
             $update_contact->save();
         });
 

From 341b56f08e5377f33353feb8d0cf62e65b7cd38f Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Sun, 12 Sep 2021 15:37:38 +1000
Subject: [PATCH 3/3] v5.3.10

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

diff --git a/VERSION.txt b/VERSION.txt
index 769f5e0bec78..d6403175aa5d 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.9
\ No newline at end of file
+5.3.10
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 89d7ba65bf3e..1364c4d095ed 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.3.9',
-    'app_tag' => '5.3.9',
+    'app_version' => '5.3.10',
+    'app_tag' => '5.3.10',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),