From 79936adbb956a45764ad2d20bc0448a86900982f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 21 Sep 2023 13:38:46 +1000
Subject: [PATCH] v5.7.22

---
 .github/workflows/release.yml         | 1 +
 VERSION.txt                           | 2 +-
 app/Console/Commands/ReactBuilder.php | 8 ++++----
 config/ninja.php                      | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c00ee723b2d8..1530d673ddf9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,6 +49,7 @@ jobs:
           
           mkdir -p ../public/react/${{ github.event.release.tag_name }}/
           cp -r dist/react/* ../public/react/${{ github.event.release.tag_name }}/
+          cp -r dist/react/* ../public/react/
 
           mkdir -p ../public/tinymce_6.4.2/tinymce/js/
           cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/
diff --git a/VERSION.txt b/VERSION.txt
index cf3060b3b8dd..9c4a47d19386 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.21
\ No newline at end of file
+5.7.22
\ No newline at end of file
diff --git a/app/Console/Commands/ReactBuilder.php b/app/Console/Commands/ReactBuilder.php
index c6f6a854e7cd..48dc2614d84c 100644
--- a/app/Console/Commands/ReactBuilder.php
+++ b/app/Console/Commands/ReactBuilder.php
@@ -48,19 +48,19 @@ class ReactBuilder extends Command
     {
         $includes = '';
 
-        $directoryIterator = new \RecursiveDirectoryIterator(public_path('react'), \RecursiveDirectoryIterator::SKIP_DOTS);
+        $directoryIterator = new \RecursiveDirectoryIterator(public_path('react/v'.config('ninja.app_version').'/'), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
             if ($file->getExtension() == 'js') {
                 if (str_contains($file->getFileName(), 'index-')) {
-                    $includes .= '<script type="module" crossorigin src="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'"></script>'."\n";
+                    $includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
                 } else {
-                    $includes .= '<link rel="modulepreload" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
+                    $includes .= '<link rel="modulepreload" href="/react/'.$file->getFileName().'">'."\n";
                 }
             }
 
             if (str_contains($file->getFileName(), '.css')) {
-                $includes .= '<link rel="stylesheet" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
+                $includes .= '<link rel="stylesheet" href="/react/'.$file->getFileName().'">'."\n";
             }
         }
 
diff --git a/config/ninja.php b/config/ninja.php
index 969ccc9f100a..a025e539680b 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -15,8 +15,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.21'),
-    'app_tag' => env('APP_TAG','5.7.21'),
+    'app_version' => env('APP_VERSION','5.7.22'),
+    'app_tag' => env('APP_TAG','5.7.22'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),