From 9ae2d54a5e1959c5df72dd33a01b5d7e44cad24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Thu, 10 Mar 2022 16:23:13 +0100
Subject: [PATCH] team invitation notification with broadcasting

---
 config/broadcasting.php                       |  8 +--
 config/vuefilemanager.php                     |  4 +-
 config/websockets.php                         | 16 +++--
 public/mix-manifest.json                      |  6 +-
 .../components/Notifications/Notification.vue | 29 ++++++++-
 .../Notifications/NotificationCenter.vue      | 41 -------------
 resources/js/store/modules/userAuth.js        | 17 ++++++
 routes/admin.php                              |  4 +-
 routes/user.php                               |  6 +-
 routes/web.php                                |  3 +-
 .../Console/Commands/SetupDevEnvironment.php  |  6 +-
 src/App/Http/Kernel.php                       |  1 -
 src/App/Providers/RouteServiceProvider.php    |  4 +-
 .../AccountAccessTokenController.php          |  1 -
 src/App/Users/Resources/UserResource.php      | 17 +++---
 .../Users/Resources/UserStorageResource.php   | 27 ++++-----
 .../Dashboard/GetDashboardDataController.php  |  2 +-
 .../Actions/StoreFileExifMetadataAction.php   | 45 +++++++-------
 src/Domain/Files/Actions/UploadFileAction.php |  1 -
 src/Domain/Files/Models/Exif.php              |  8 +--
 src/Domain/Files/Models/File.php              |  6 +-
 src/Domain/Files/Resources/FileResource.php   |  6 +-
 .../FlushUserNotificationsController.php      |  5 +-
 .../GetUserNotificationsController.php        |  3 +-
 .../MarkUserNotificationsAsReadController.php |  5 +-
 .../Notifications/Events/TestUpdate.php       |  2 +-
 .../Resources/NotificationResource.php        |  1 -
 .../Controllers/DownloadLogController.php     | 11 ++--
 .../StoreStorageCredentialsController.php     |  5 +-
 .../StoreEnvironmentSettingsController.php    |  2 +-
 ...arActionInInvitationNotificationAction.php | 38 ++++++++++++
 .../InviteMembersIntoTeamFolderAction.php     | 17 +++++-
 .../ConvertFolderIntoTeamFolderController.php |  1 -
 .../Controllers/InvitationsController.php     | 40 ++++++++++---
 .../Controllers/TeamFoldersController.php     |  2 +-
 .../InvitationIntoTeamFolder.php              | 23 ++++++-
 .../CreateUploadRequestController.php         |  1 -
 .../SetUploadRequestAsFilledController.php    |  4 +-
 .../UploadFilesForUploadRequestController.php |  4 +-
 .../UploadRequestFulfilledNotification.php    |  6 +-
 .../Requests/StoreUploadRequest.php           |  1 -
 .../Resources/UploadRequestResource.php       |  4 +-
 src/Support/Middleware/AdminCheck.php         |  3 +-
 src/Support/Middleware/TrustProxies.php       |  2 +-
 src/Support/helpers.php                       | 13 ++--
 tests/Domain/Files/FileTest.php               |  8 +--
 .../Notifications/NotificationsTest.php       |  9 ++-
 tests/Domain/Settings/SettingsTest.php        |  1 -
 tests/Domain/Teams/TeamManagementTest.php     | 60 +++++++++++++++++++
 .../UploadRequest/UploadRequestTest.php       |  3 +-
 50 files changed, 331 insertions(+), 201 deletions(-)
 create mode 100644 src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php

diff --git a/config/broadcasting.php b/config/broadcasting.php
index cea9e7d3..ae00e4cc 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -34,11 +34,11 @@ return [
             'secret'  => env('PUSHER_APP_SECRET'),
             'app_id'  => env('PUSHER_APP_ID'),
             'options' => [
-                'cluster' => env('PUSHER_APP_CLUSTER'),
+                'cluster'   => env('PUSHER_APP_CLUSTER'),
                 'encrypted' => true,
-                'host' => '192.168.1.112',
-                'port' => 6001,
-                'scheme' => 'http'
+                'host'      => '192.168.1.112',
+                'port'      => 6001,
+                'scheme'    => 'http',
             ],
         ],
 
diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php
index fdbafd41..7ac11824 100644
--- a/config/vuefilemanager.php
+++ b/config/vuefilemanager.php
@@ -5,8 +5,8 @@ return [
 
     'is_demo' => env('APP_DEMO', false),
 
-    'is_setup_wizard_demo' => env('IS_SETUP_WIZARD_DEMO', false),
-    'is_setup_wizard_debug' => env('IS_SETUP_WIZARD_DEBUG', false),
+    'is_setup_wizard_demo'        => env('IS_SETUP_WIZARD_DEMO', false),
+    'is_setup_wizard_debug'       => env('IS_SETUP_WIZARD_DEBUG', false),
     'is_admin_vuefilemanager_bar' => env('IS_ADMIN_VUEFILEMANAGER_BAR', true),
 
     // Define size of chunk uploaded by MB.
diff --git a/config/websockets.php b/config/websockets.php
index 45415d76..98ec5d8d 100644
--- a/config/websockets.php
+++ b/config/websockets.php
@@ -3,7 +3,6 @@
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize;
 
 return [
-
     /*
      * Set a custom dashboard configuration
      */
@@ -23,14 +22,14 @@ return [
      */
     'apps' => [
         [
-            'id' => env('PUSHER_APP_ID'),
-            'name' => env('APP_NAME'),
-            'key' => env('PUSHER_APP_KEY'),
-            'secret' => env('PUSHER_APP_SECRET'),
-            'path' => env('PUSHER_APP_PATH'),
-            'capacity' => null,
+            'id'                     => env('PUSHER_APP_ID'),
+            'name'                   => env('APP_NAME'),
+            'key'                    => env('PUSHER_APP_KEY'),
+            'secret'                 => env('PUSHER_APP_SECRET'),
+            'path'                   => env('PUSHER_APP_PATH'),
+            'capacity'               => null,
             'enable_client_messages' => false,
-            'enable_statistics' => true,
+            'enable_statistics'      => true,
         ],
     ],
 
@@ -48,7 +47,6 @@ return [
      * Leave this empty if you want to accept requests from all hosts.
      */
     'allowed_origins' => [
-        //
     ],
 
     /*
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 4abd01ca..db4e59fc 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -15,7 +15,7 @@
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=92c75a6c77689046",
     "/chunks/not-found.js": "/chunks/not-found.js?id=36763aa314e00327",
     "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=a3906226272982b1",
-    "/chunks/admin.js": "/chunks/admin.js?id=920613c2b7236639",
+    "/chunks/admin.js": "/chunks/admin.js?id=a9cc617d7342978a",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=e7c6001687e641eb",
     "/chunks/invoices.js": "/chunks/invoices.js?id=85fd4514d3d85a71",
     "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=9f970bdfc7583080",
@@ -57,12 +57,12 @@
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=098d7f41b85066bf",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=d6193ed0b07e7957",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=d00212636148a14b",
-    "/chunks/settings.js": "/chunks/settings.js?id=f4a7bce3ff4c61a9",
+    "/chunks/settings.js": "/chunks/settings.js?id=71ee8010419a7b69",
     "/chunks/profile.js": "/chunks/profile.js?id=1217f457145491ec",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=b6704f4cbf14c67d",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=90ba712f3728443b",
     "/chunks/billing.js": "/chunks/billing.js?id=27957f2477fdd121",
-    "/chunks/platform.js": "/chunks/platform.js?id=85ee6709fe4e3b7e",
+    "/chunks/platform.js": "/chunks/platform.js?id=4001e2c2fd8b27ce",
     "/chunks/files.js": "/chunks/files.js?id=0d4e7a1330328eae",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=2362f8fa4e3392e9",
     "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=25e9d29dd3c29338",
diff --git a/resources/js/components/Notifications/Notification.vue b/resources/js/components/Notifications/Notification.vue
index ac475417..5aa547b8 100644
--- a/resources/js/components/Notifications/Notification.vue
+++ b/resources/js/components/Notifications/Notification.vue
@@ -23,7 +23,7 @@
                 {{ notification.data.attributes.description }}
             </p>
 
-            <div class="mb-4 flex items-center">
+            <div class="flex items-center">
                 <!--<MemberAvatar class="mr-2" :size="22" :is-border="false" :member="user" />-->
                 <time class="block text-xs text-gray-400 dark:text-gray-400">
                     {{ notification.data.attributes.created_at }}
@@ -31,8 +31,9 @@
             </div>
 
             <!--Accept or decline team invitation-->
-            <div v-if="notification.data.attributes.type === 'team-invitation'" class="flex items-center space-x-3">
+            <div v-if="action && action.type === 'invitation'" class="flex items-center space-x-3 mt-4">
                 <div
+					@click="acceptAction"
                     class="flex cursor-pointer items-center rounded-xl py-1.5 px-2 transition-colors hover:bg-green-100 dark:hover:bg-green-900"
                 >
                     <check-icon size="16" class="vue-feather mr-2 text-green-600 dark:text-green-600" />
@@ -42,6 +43,7 @@
                 </div>
 
                 <div
+					@click="declineAction"
                     class="flex cursor-pointer items-center rounded-xl py-1.5 px-2 transition-colors hover:bg-rose-100 dark:hover:bg-rose-900"
                 >
                     <x-icon size="16" class="vue-feather mr-2 text-rose-600 dark:text-rose-600" />
@@ -69,6 +71,7 @@
 <script>
 import { CheckIcon, XIcon, MailIcon, UserPlusIcon, UploadCloudIcon, ChevronRightIcon } from 'vue-feather-icons'
 import MemberAvatar from '../FilesView/MemberAvatar'
+import {events} from "../../bus";
 
 export default {
     name: 'Notification',
@@ -93,6 +96,28 @@ export default {
 		}
 	},
     methods: {
+		acceptAction() {
+			axios.put(`/api/teams/invitations/${this.notification.data.attributes.action.params.id}`)
+				.then(() => {
+					this.$store.commit('CLEAR_NOTIFICATION_ACTION_DATA', this.notification.data.id)
+
+					events.$emit('toaster', {
+						type: 'success',
+						message: this.$t('You successfully accepted invitation'),
+					})
+				})
+		},
+		declineAction() {
+			axios.delete(`/api/teams/invitations/${this.notification.data.attributes.action.params.id}`)
+				.then(() => {
+					this.$store.commit('CLEAR_NOTIFICATION_ACTION_DATA', this.notification.data.id)
+
+					events.$emit('toaster', {
+						type: 'success',
+						message: this.$t('You successfully decline invitation'),
+					})
+				})
+		},
         closeCenter() {
             this.$store.commit('TOGGLE_NOTIFICATION_CENTER')
         },
diff --git a/resources/js/components/Notifications/NotificationCenter.vue b/resources/js/components/Notifications/NotificationCenter.vue
index 96039ba0..a170b846 100644
--- a/resources/js/components/Notifications/NotificationCenter.vue
+++ b/resources/js/components/Notifications/NotificationCenter.vue
@@ -72,47 +72,6 @@ export default {
 			return this.user.data.relationships.unreadNotifications.data
 		}
 	},
-	data() {
-		return {
-			laterNotifications: [
-				{
-					id: 1,
-					seen: 1,
-					type: 'remote-upload-done',
-					title: 'Remote Upload Finished',
-					description: 'Your remote uploads has been done.',
-					time: '09. Mar. 2022, 08:27',
-					action: {
-						id: '12-abc'
-					}
-				},
-			],
-			todayNotifications: [
-				{
-					id: 2,
-					seen: 0,
-					type: 'team-invitation',
-					title: 'New Team Invitation',
-					description: 'Jane Doe invite you to join into “Work Documents” Team Folder.',
-					time: '09. Mar. 2022, 08:27',
-					action: {
-						id: '12-abc'
-					}
-				},
-				{
-					id: 3,
-					seen: 0,
-					type: 'file-request',
-					title: 'File Request Filled',
-					description: 'Your file request for “Videohive” folder was filled successfully.',
-					time: '09. Mar. 2022, 07:12',
-					action: {
-						id: '12-abc'
-					}
-				},
-			]
-		}
-	},
 	methods: {
 		deleteAllNotifications() {
 			axios.delete('/api/user/notifications')
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index 36dd5868..6ee6b165 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -180,6 +180,23 @@ const mutations = {
         state.user.data.relationships.readNotifications.data = []
         state.user.data.relationships.unreadNotifications.data = []
     },
+    CLEAR_NOTIFICATION_ACTION_DATA(state, notificationId) {
+        if (state.user.data.relationships.readNotifications.data.length) {
+            state.user.data.relationships.readNotifications.data.map(notification => {
+                if (notification.data.id === notificationId) {
+                    notification.data.attributes.action = undefined
+                }
+            })
+        }
+
+        if (state.user.data.relationships.unreadNotifications.data.length) {
+            state.user.data.relationships.unreadNotifications.data.map(notification => {
+                if (notification.data.id === notificationId) {
+                    notification.data.attributes.action = undefined
+                }
+            })
+        }
+    },
 }
 
 const getters = {
diff --git a/routes/admin.php b/routes/admin.php
index 2f4fc5cf..557171b4 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -9,12 +9,12 @@ use Domain\Settings\Controllers\GetServerStatusController;
 use Domain\Settings\Controllers\GetSettingsValueController;
 use Domain\Admin\Controllers\Dashboard\GetNewbiesController;
 use Domain\Admin\Controllers\Users\ChangeUserRoleController;
-use Domain\Settings\Controllers\StoreStorageCredentialsController;
 use Domain\Settings\Controllers\UpdateSettingValueController;
 use Domain\Admin\Controllers\Users\ResetUserPasswordController;
 use Domain\Settings\Controllers\StoreEmailCredentialsController;
 use Domain\Transactions\Controllers\GetAllTransactionsController;
 use Domain\Admin\Controllers\Dashboard\GetDashboardDataController;
+use Domain\Settings\Controllers\StoreStorageCredentialsController;
 use Domain\Transactions\Controllers\GetUserTransactionsController;
 use Domain\Localization\Controllers\UpdateLanguageStringController;
 use Domain\Admin\Controllers\Users\ShowUserStorageCapacityController;
@@ -62,4 +62,4 @@ Route::patch('/languages/{language}/strings', UpdateLanguageStringController::cl
 Route::apiResource('/languages', LanguageController::class);
 
 // Server Status
-Route::get('/status', GetServerStatusController::class);
\ No newline at end of file
+Route::get('/status', GetServerStatusController::class);
diff --git a/routes/user.php b/routes/user.php
index 0e8fed92..0f1c60ec 100644
--- a/routes/user.php
+++ b/routes/user.php
@@ -4,14 +4,14 @@ use App\Users\Controllers\Account\AccountDetailsController;
 use App\Users\Controllers\Account\UpdatePasswordController;
 use App\Users\Controllers\Account\StorageCapacityController;
 use App\Users\Controllers\Verification\VerifyEmailController;
-use Domain\Notifications\Controllers\FlushUserNotificationsController;
-use Domain\Notifications\Controllers\GetUserNotificationsController;
-use Domain\Notifications\Controllers\MarkUserNotificationsAsReadController;
 use Domain\Transactions\Controllers\GetTransactionsController;
 use App\Users\Controllers\Verification\ResendVerificationEmail;
 use App\Users\Controllers\Authentication\CheckAccountController;
 use App\Users\Controllers\Account\UpdateProfileSettingsController;
+use Domain\Notifications\Controllers\GetUserNotificationsController;
 use App\Users\Controllers\Authentication\AccountAccessTokenController;
+use Domain\Notifications\Controllers\FlushUserNotificationsController;
+use Domain\Notifications\Controllers\MarkUserNotificationsAsReadController;
 
 Route::post('/check', CheckAccountController::class);
 
diff --git a/routes/web.php b/routes/web.php
index b680de45..7e1c5974 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,8 +3,8 @@
 use Domain\Homepage\Controllers\IndexController;
 use Domain\Invoices\Controllers\GetInvoiceController;
 use Domain\Settings\Controllers\DownloadLogController;
-use Domain\Sharing\Controllers\SharePublicIndexController;
 use App\Socialite\Controllers\SocialiteCallbackController;
+use Domain\Sharing\Controllers\SharePublicIndexController;
 use Domain\Sharing\Controllers\WebCrawlerOpenGraphController;
 use Domain\Localization\Controllers\CurrentLocalizationController;
 
@@ -20,7 +20,6 @@ Route::get('/invoices/{invoice}', GetInvoiceController::class)
 Route::get('/admin/log/{log}', DownloadLogController::class)
     ->middleware(['auth:sanctum', 'admin']);
 
-
 // Get og site for web crawlers
 if (Crawler::isCrawler()) {
     Route::get('/share/{share}', WebCrawlerOpenGraphController::class);
diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php
index 885d5d6b..72fdfc28 100644
--- a/src/App/Console/Commands/SetupDevEnvironment.php
+++ b/src/App/Console/Commands/SetupDevEnvironment.php
@@ -898,7 +898,7 @@ class SetupDevEnvironment extends Command
         ])
             ->each(function ($file) use ($users, $financeDocumentsFolder, $otherDocuments) {
                 $user = $users[rand(0, 2)];
-                $folder = [$financeDocumentsFolder, $otherDocuments][rand(0,1)];
+                $folder = [$financeDocumentsFolder, $otherDocuments][rand(0, 1)];
 
                 $basename = Str::random(12) . '-' . $file['basename'];
 
@@ -1120,7 +1120,7 @@ class SetupDevEnvironment extends Command
             'Smart Watch 3D Device Pack for Element 3D.mp4',
         ])
             ->each(function ($file) use ($users, $videos) {
-                $user = $users[rand(0,1)];
+                $user = $users[rand(0, 1)];
 
                 $basename = Str::random(12) . '-' . $file;
 
@@ -1151,7 +1151,7 @@ class SetupDevEnvironment extends Command
             ->each(function ($file) use ($users, $folder) {
                 $basename = Str::random(12) . '-' . $file['basename'];
 
-                $user = $users[rand(0,1)];
+                $user = $users[rand(0, 1)];
 
                 // Copy file into app storage
                 Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private');
diff --git a/src/App/Http/Kernel.php b/src/App/Http/Kernel.php
index 83831723..3385b560 100644
--- a/src/App/Http/Kernel.php
+++ b/src/App/Http/Kernel.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace App\Http;
 
 use Fruitcake\Cors\HandleCors;
diff --git a/src/App/Providers/RouteServiceProvider.php b/src/App/Providers/RouteServiceProvider.php
index 047d25e0..eb2742e2 100644
--- a/src/App/Providers/RouteServiceProvider.php
+++ b/src/App/Providers/RouteServiceProvider.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Providers;
 
-use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
 class RouteServiceProvider extends ServiceProvider
diff --git a/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php b/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php
index 5082a610..272c8236 100644
--- a/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php
+++ b/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace App\Users\Controllers\Authentication;
 
 use Illuminate\Support\Str;
diff --git a/src/App/Users/Resources/UserResource.php b/src/App/Users/Resources/UserResource.php
index c336b001..b32a01e1 100644
--- a/src/App/Users/Resources/UserResource.php
+++ b/src/App/Users/Resources/UserResource.php
@@ -1,11 +1,10 @@
 <?php
-
 namespace App\Users\Resources;
 
-use Domain\Notifications\Resources\NotificationCollection;
 use Domain\Folders\Resources\FolderCollection;
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Users\Actions\FormatUsageEstimatesAction;
+use Domain\Notifications\Resources\NotificationCollection;
 use VueFileManager\Subscription\Domain\Credits\Resources\BalanceResource;
 use VueFileManager\Subscription\Domain\CreditCards\Resources\CreditCardCollection;
 use VueFileManager\Subscription\Domain\BillingAlerts\Resources\BillingAlertResource;
@@ -49,16 +48,16 @@ class UserResource extends JsonResource
                     'settings'            => new SettingsResource($this->settings),
                     'favourites'          => new FolderCollection($this->favouriteFolders),
                     'creditCards'         => new CreditCardCollection($this->creditCards),
-                    $this->mergeWhen($this->hasSubscription(), fn() => [
+                    $this->mergeWhen($this->hasSubscription(), fn () => [
                         'subscription' => new SubscriptionResource($this->subscription),
                     ]),
-                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn() => [
+                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn () => [
                         'balance' => new BalanceResource($this->balance),
                     ]),
-                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn() => [
+                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn () => [
                         'alert' => new BillingAlertResource($this->billingAlert),
                     ]),
-                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn() => [
+                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn () => [
                         'failedPayments' => new FailedPaymentsCollection($this->failedPayments),
                     ]),
                 ],
@@ -70,13 +69,13 @@ class UserResource extends JsonResource
                         'canCreateTeamFolder'  => $this->canCreateTeamFolder(),
                         'canInviteTeamMembers' => $this->canInviteTeamMembers(),
                     ],
-                    $this->mergeWhen($isFixedSubscription, fn() => [
+                    $this->mergeWhen($isFixedSubscription, fn () => [
                         'limitations' => $this->limitations->summary(),
                     ]),
-                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn() => [
+                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn () => [
                         'usages' => $this->getUsageEstimates(),
                     ]),
-                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn() => [
+                    $this->mergeWhen($isMeteredSubscription && $this->hasSubscription(), fn () => [
                         'totalDebt' => [
                             'formatted' => format_currency($this->failedPayments->sum('amount'), $this->subscription->plan->currency),
                             'amount'    => $this->failedPayments->sum('amount'),
diff --git a/src/App/Users/Resources/UserStorageResource.php b/src/App/Users/Resources/UserStorageResource.php
index 97c2c806..4fb05005 100644
--- a/src/App/Users/Resources/UserStorageResource.php
+++ b/src/App/Users/Resources/UserStorageResource.php
@@ -1,10 +1,7 @@
 <?php
-
 namespace App\Users\Resources;
 
 use ByteUnits\Metric;
-use Carbon\CarbonPeriod;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -23,18 +20,18 @@ class UserStorageResource extends JsonResource
 
         $totalCapacity = match (get_settings('subscription_type')) {
             'metered' => $this->usedCapacity / 1000000000,
-            'fixed' => $this->limitations->max_storage_amount,
-            default => $this->limitations->max_storage_amount,
+            'fixed'   => $this->limitations->max_storage_amount,
+            default   => $this->limitations->max_storage_amount,
         };
 
         return [
             'data' => [
-                'id'         => (string)$this->id,
+                'id'         => (string) $this->id,
                 'type'       => 'storage',
                 'attributes' => [
                     'used'       => Metric::bytes($this->usedCapacity)->format(),
                     'capacity'   => format_gigabytes($totalCapacity),
-                    'percentage' => (float)get_storage_percentage($this->usedCapacity, $totalCapacity),
+                    'percentage' => (float) get_storage_percentage($this->usedCapacity, $totalCapacity),
                 ],
                 'meta'       => [
                     'traffic'   => [
@@ -47,23 +44,23 @@ class UserStorageResource extends JsonResource
                     ],
                     'images'    => [
                         'used'       => Metric::bytes($images)->format(),
-                        'percentage' => (float)get_storage_percentage($images, $totalCapacity),
+                        'percentage' => (float) get_storage_percentage($images, $totalCapacity),
                     ],
                     'audios'    => [
                         'used'       => Metric::bytes($audios)->format(),
-                        'percentage' => (float)get_storage_percentage($audios, $totalCapacity),
+                        'percentage' => (float) get_storage_percentage($audios, $totalCapacity),
                     ],
                     'videos'    => [
                         'used'       => Metric::bytes($videos)->format(),
-                        'percentage' => (float)get_storage_percentage($videos, $totalCapacity),
+                        'percentage' => (float) get_storage_percentage($videos, $totalCapacity),
                     ],
                     'documents' => [
                         'used'       => Metric::bytes($documents)->format(),
-                        'percentage' => (float)get_storage_percentage($documents, $totalCapacity),
+                        'percentage' => (float) get_storage_percentage($documents, $totalCapacity),
                     ],
                     'others'    => [
                         'used'       => Metric::bytes($others)->format(),
-                        'percentage' => (float)get_storage_percentage($others, $totalCapacity),
+                        'percentage' => (float) get_storage_percentage($others, $totalCapacity),
                     ],
                 ],
             ],
@@ -134,12 +131,12 @@ class UserStorageResource extends JsonResource
             ->where('created_at', '>', $period)
             ->orderBy('created_at')
             ->get(['upload', 'download', 'created_at'])
-            ->each(fn($record) => $record->created_at = format_date($record->created_at, 'd. M. Y'))
+            ->each(fn ($record) => $record->created_at = format_date($record->created_at, 'd. M. Y'))
             ->keyBy('created_at');
 
         $mappedTrafficRecords = mapTrafficRecords($trafficRecords);
 
-        $upload = $mappedTrafficRecords->map(fn($record) => [
+        $upload = $mappedTrafficRecords->map(fn ($record) => [
             'created_at' => $record->created_at,
             'amount'     => Metric::bytes($record->upload)->format(),
             'percentage' => intval($uploadMax) !== 0
@@ -147,7 +144,7 @@ class UserStorageResource extends JsonResource
                 : 0,
         ]);
 
-        $download = $mappedTrafficRecords->map(fn($record) => [
+        $download = $mappedTrafficRecords->map(fn ($record) => [
             'created_at' => $record->created_at,
             'amount'     => Metric::bytes($record->download)->format(),
             'percentage' => intval($downloadMax) !== 0
diff --git a/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php b/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php
index 893e4ef1..d8cf9413 100644
--- a/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php
+++ b/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php
@@ -65,7 +65,7 @@ class GetDashboardDataController extends Controller
             )
             ->groupBy('created_at')
             ->get(['upload', 'download', 'created_at'])
-            ->each(fn($record) => $record->created_at = format_date($record->created_at, 'd. M. Y'))
+            ->each(fn ($record) => $record->created_at = format_date($record->created_at, 'd. M. Y'))
             ->keyBy('created_at');
 
         $mappedTrafficRecords = mapTrafficRecords($trafficRecords);
diff --git a/src/Domain/Files/Actions/StoreFileExifMetadataAction.php b/src/Domain/Files/Actions/StoreFileExifMetadataAction.php
index 01886c4d..8ed8533e 100644
--- a/src/Domain/Files/Actions/StoreFileExifMetadataAction.php
+++ b/src/Domain/Files/Actions/StoreFileExifMetadataAction.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Files\Actions;
 
 class StoreFileExifMetadataAction
@@ -9,33 +8,31 @@ class StoreFileExifMetadataAction
         // Get exif metadata
         $exif_data = get_image_meta_data($file);
 
-        if($exif_data) {
-
+        if ($exif_data) {
             // Conver array to collection
-            $data = json_decode(json_encode($exif_data)) ;
+            $data = json_decode(json_encode($exif_data));
 
             $item->exif()->create([
-                'date_time_original' => $data->DateTimeOriginal             ?? null,
-                'artist'             => $data->OwnerName                    ?? null,
-                'width'              => $data->COMPUTED->Width              ?? null,
-                'height'             => $data->COMPUTED->Height             ?? null,
-                'x_resolution'       => $data->XResolution                  ?? null,
-                'y_resolution'       => $data->YResolution                  ?? null,
-                'color_space'        => $data->ColorSpace                   ?? null,
-                'camera'             => $data->Make                         ?? null,
-                'model'              => $data->Model                        ?? null,
-                'aperture_value'     => $data->ApertureValue                ?? null,
-                'exposure_time'      => $data->ExposureTime                 ?? null,
-                'focal_length'       => $data->FocalLength                  ?? null,
-                'iso'                => $data->ISOSpeedRatings              ?? null,
-                'aperture_f_number'  => $data->COMPUTED->ApertureFNumber    ?? null,
-                'ccd_width'          => $data->COMPUTED->CCDWidth           ?? null,
-                'longitude'          => $data->GPSLongitude                 ?? null,
-                'latitude'           => $data->GPSLatitude                  ?? null,
-                'longitude_ref'      => $data->GPSLongitudeRef              ?? null,
-                'latitude_ref'       => $data->GPSLatitudeRef               ?? null
+                'date_time_original' => $data->DateTimeOriginal ?? null,
+                'artist'             => $data->OwnerName ?? null,
+                'width'              => $data->COMPUTED->Width ?? null,
+                'height'             => $data->COMPUTED->Height ?? null,
+                'x_resolution'       => $data->XResolution ?? null,
+                'y_resolution'       => $data->YResolution ?? null,
+                'color_space'        => $data->ColorSpace ?? null,
+                'camera'             => $data->Make ?? null,
+                'model'              => $data->Model ?? null,
+                'aperture_value'     => $data->ApertureValue ?? null,
+                'exposure_time'      => $data->ExposureTime ?? null,
+                'focal_length'       => $data->FocalLength ?? null,
+                'iso'                => $data->ISOSpeedRatings ?? null,
+                'aperture_f_number'  => $data->COMPUTED->ApertureFNumber ?? null,
+                'ccd_width'          => $data->COMPUTED->CCDWidth ?? null,
+                'longitude'          => $data->GPSLongitude ?? null,
+                'latitude'           => $data->GPSLatitude ?? null,
+                'longitude_ref'      => $data->GPSLongitudeRef ?? null,
+                'latitude_ref'       => $data->GPSLatitudeRef ?? null,
             ]);
         }
-
     }
 }
diff --git a/src/Domain/Files/Actions/UploadFileAction.php b/src/Domain/Files/Actions/UploadFileAction.php
index 56786fa5..a7b30cc3 100644
--- a/src/Domain/Files/Actions/UploadFileAction.php
+++ b/src/Domain/Files/Actions/UploadFileAction.php
@@ -11,7 +11,6 @@ use Domain\Files\Models\File as UserFile;
 use Domain\Traffic\Actions\RecordUploadAction;
 use App\Users\Exceptions\InvalidUserActionException;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
-use Domain\Files\Actions\StoreFileExifMetadataAction;
 
 class UploadFileAction
 {
diff --git a/src/Domain/Files/Models/Exif.php b/src/Domain/Files/Models/Exif.php
index 2af4554b..fa0b9b17 100644
--- a/src/Domain/Files/Models/Exif.php
+++ b/src/Domain/Files/Models/Exif.php
@@ -1,12 +1,10 @@
 <?php
-
-namespace  Domain\Files\Models;
+namespace Domain\Files\Models;
 
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Exif extends Model
 {
@@ -22,7 +20,7 @@ class Exif extends Model
 
     protected $casts = [
         'longitude' => 'array',
-        'latitude' => 'array',
+        'latitude'  => 'array',
     ];
 
     /**
diff --git a/src/Domain/Files/Models/File.php b/src/Domain/Files/Models/File.php
index 501b0507..65edc245 100644
--- a/src/Domain/Files/Models/File.php
+++ b/src/Domain/Files/Models/File.php
@@ -226,10 +226,10 @@ class File extends Model
             $file->id = (string) Str::uuid();
         });
 
-        static::deleting(function($file) {
-            if($file->isForceDeleting()) {
+        static::deleting(function ($file) {
+            if ($file->isForceDeleting()) {
                 $file->exif()->forceDelete();
-            };
+            }
         });
     }
 }
diff --git a/src/Domain/Files/Resources/FileResource.php b/src/Domain/Files/Resources/FileResource.php
index 2c13ea0d..6472a903 100644
--- a/src/Domain/Files/Resources/FileResource.php
+++ b/src/Domain/Files/Resources/FileResource.php
@@ -63,7 +63,7 @@ class FileResource extends JsonResource
                             ],
                         ],
                     ]),
-                    $this->mergeWhen($this->exif, fn() => [
+                    $this->mergeWhen($this->exif, fn () => [
                         'exif' => [
                             'data' => [
                                 'type'       => 'exif',
@@ -88,8 +88,8 @@ class FileResource extends JsonResource
                                     'latitude'           => formatGPSCoordinates($this->exif->latitude, $this->exif->latitude_ref),
                                 ],
                             ],
-                        ]
-                    ])
+                        ],
+                    ]),
                 ],
             ],
         ];
diff --git a/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php b/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php
index ba787b80..31649db7 100644
--- a/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php
+++ b/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php
@@ -1,11 +1,10 @@
 <?php
-
 namespace Domain\Notifications\Controllers;
 
+use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use Illuminate\Http\Response;
 
 class FlushUserNotificationsController extends Controller
 {
@@ -20,4 +19,4 @@ class FlushUserNotificationsController extends Controller
 
         return response('Done', 204);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Domain/Notifications/Controllers/GetUserNotificationsController.php b/src/Domain/Notifications/Controllers/GetUserNotificationsController.php
index bd1f49d0..6281726f 100644
--- a/src/Domain/Notifications/Controllers/GetUserNotificationsController.php
+++ b/src/Domain/Notifications/Controllers/GetUserNotificationsController.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Notifications\Controllers;
 
 use App\Http\Controllers\Controller;
@@ -13,4 +12,4 @@ class GetUserNotificationsController extends Controller
             auth()->user()->notifications
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php b/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php
index b06bb832..b886a8d4 100644
--- a/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php
+++ b/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php
@@ -1,11 +1,10 @@
 <?php
-
 namespace Domain\Notifications\Controllers;
 
+use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use Illuminate\Http\Response;
 
 class MarkUserNotificationsAsReadController extends Controller
 {
@@ -20,4 +19,4 @@ class MarkUserNotificationsAsReadController extends Controller
 
         return response('Done', 204);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Domain/Notifications/Events/TestUpdate.php b/src/Domain/Notifications/Events/TestUpdate.php
index 92cd4dd6..57a756e0 100644
--- a/src/Domain/Notifications/Events/TestUpdate.php
+++ b/src/Domain/Notifications/Events/TestUpdate.php
@@ -2,8 +2,8 @@
 namespace Domain\Notifications\Events;
 
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class TestUpdate implements ShouldBroadcast
 {
diff --git a/src/Domain/Notifications/Resources/NotificationResource.php b/src/Domain/Notifications/Resources/NotificationResource.php
index f95d9018..5ef8ac5a 100644
--- a/src/Domain/Notifications/Resources/NotificationResource.php
+++ b/src/Domain/Notifications/Resources/NotificationResource.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Notifications\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/src/Domain/Settings/Controllers/DownloadLogController.php b/src/Domain/Settings/Controllers/DownloadLogController.php
index 9182a6d6..3f9351cf 100644
--- a/src/Domain/Settings/Controllers/DownloadLogController.php
+++ b/src/Domain/Settings/Controllers/DownloadLogController.php
@@ -1,12 +1,11 @@
 <?php
-
 namespace Domain\Settings\Controllers;
 
+use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\File;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\File;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class DownloadLogController extends Controller
@@ -22,7 +21,9 @@ class DownloadLogController extends Controller
 
         // Download log
         return response()->download(
-            storage_path("logs/$log"), $log, [
+            storage_path("logs/$log"),
+            $log,
+            [
                 'Accept-Ranges'       => 'bytes',
                 'Content-Type'        => 'text/plain',
                 'Content-Length'      => File::size($logPath),
@@ -31,4 +32,4 @@ class DownloadLogController extends Controller
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/Domain/Settings/Controllers/StoreStorageCredentialsController.php b/src/Domain/Settings/Controllers/StoreStorageCredentialsController.php
index e0a88824..09800749 100644
--- a/src/Domain/Settings/Controllers/StoreStorageCredentialsController.php
+++ b/src/Domain/Settings/Controllers/StoreStorageCredentialsController.php
@@ -2,9 +2,8 @@
 namespace Domain\Settings\Controllers;
 
 use Artisan;
-use Domain\Settings\Requests\StoreStorageCredentialsRequest;
 use Illuminate\Http\Response;
-use Domain\Settings\Requests\StoreEmailCredentialsRequest;
+use Domain\Settings\Requests\StoreStorageCredentialsRequest;
 
 class StoreStorageCredentialsController
 {
@@ -22,7 +21,7 @@ class StoreStorageCredentialsController
                     'FILESYSTEM_DISK' => 'local',
                 ],
                 's3'    => [
-                    'FILESYSTEM_DISK'    => 's3',
+                    'FILESYSTEM_DISK'      => 's3',
                     'S3_ACCESS_KEY_ID'     => $request->input('storage.key') ?? null,
                     'S3_SECRET_ACCESS_KEY' => $request->input('storage.secret') ?? null,
                     'S3_DEFAULT_REGION'    => $request->input('storage.region') ?? null,
diff --git a/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php b/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
index a1abab2c..bb64dba6 100644
--- a/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
+++ b/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
@@ -20,7 +20,7 @@ class StoreEnvironmentSettingsController extends Controller
                     'FILESYSTEM_DISK' => 'local',
                 ],
                 's3'    => [
-                    'FILESYSTEM_DISK'    => 's3',
+                    'FILESYSTEM_DISK'      => 's3',
                     'S3_ACCESS_KEY_ID'     => $request->input('storage.key') ?? null,
                     'S3_SECRET_ACCESS_KEY' => $request->input('storage.secret') ?? null,
                     'S3_DEFAULT_REGION'    => $request->input('storage.region') ?? null,
diff --git a/src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php b/src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php
new file mode 100644
index 00000000..54308c4a
--- /dev/null
+++ b/src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php
@@ -0,0 +1,38 @@
+<?php
+namespace Domain\Teams\Actions;
+
+use DB;
+use App\Users\Models\User;
+use Domain\Teams\Models\TeamFolderInvitation;
+
+class ClearActionInInvitationNotificationAction
+{
+    public function __invoke(User $user, TeamFolderInvitation $invitation): void
+    {
+        if (is_demo_account()) {
+            return;
+        }
+
+        // Get notification with invitation
+        $notification = DB::table('notifications')
+            ->where('notifiable_id', $user->id)
+            ->where('data', 'LIKE', "%{$invitation->id}%")
+            ->first();
+
+        if ($notification) {
+            // Get data
+            $data = json_decode($notification->data);
+
+            // Clear action object
+            $data->action = null;
+
+            // Update notification
+            DB::table('notifications')
+                ->where('notifiable_id', $user->id)
+                ->where('data', 'LIKE', "%{$invitation->id}%")
+                ->update([
+                    'data' => json_encode($data),
+                ]);
+        }
+    }
+}
diff --git a/src/Domain/Teams/Actions/InviteMembersIntoTeamFolderAction.php b/src/Domain/Teams/Actions/InviteMembersIntoTeamFolderAction.php
index 17270116..c7564868 100644
--- a/src/Domain/Teams/Actions/InviteMembersIntoTeamFolderAction.php
+++ b/src/Domain/Teams/Actions/InviteMembersIntoTeamFolderAction.php
@@ -1,6 +1,7 @@
 <?php
 namespace Domain\Teams\Actions;
 
+use App\Users\Models\User;
 use Domain\Folders\Models\Folder;
 use Spatie\QueueableAction\QueueableAction;
 use Illuminate\Support\Facades\Notification;
@@ -25,9 +26,19 @@ class InviteMembersIntoTeamFolderAction
                     'inviter_id' => $folder->user_id,
                 ]);
 
-                // Invite user
-                Notification::route('mail', $member['email'])
-                    ->notify(new InvitationIntoTeamFolder($folder, $invitation));
+                // Get user
+                $user = User::where('email', $member['email'])->first();
+
+                // Invite native user
+                if ($user) {
+                    $user->notify(new InvitationIntoTeamFolder($folder, $invitation));
+                }
+
+                // Invite guest
+                if (! $user) {
+                    Notification::route('mail', $member['email'])
+                        ->notify(new InvitationIntoTeamFolder($folder, $invitation));
+                }
             });
     }
 }
diff --git a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
index 59682b54..f1fdb6be 100644
--- a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
+++ b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
@@ -1,7 +1,6 @@
 <?php
 namespace Domain\Teams\Controllers;
 
-use Domain\Folders\Resources\FolderResource;
 use Illuminate\Http\Response;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
diff --git a/src/Domain/Teams/Controllers/InvitationsController.php b/src/Domain/Teams/Controllers/InvitationsController.php
index 2f53ed7a..e8b4f183 100644
--- a/src/Domain/Teams/Controllers/InvitationsController.php
+++ b/src/Domain/Teams/Controllers/InvitationsController.php
@@ -8,6 +8,7 @@ use Domain\Teams\Models\TeamFolderMember;
 use Domain\Teams\Models\TeamFolderInvitation;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Teams\Resources\TeamInvitationResource;
+use Domain\Teams\Actions\ClearActionInInvitationNotificationAction;
 
 class InvitationsController extends Controller
 {
@@ -21,22 +22,31 @@ class InvitationsController extends Controller
     }
 
     public function update(
-        TeamFolderInvitation $invitation
-    ): ResponseFactory | Response {
-        $user = User::where('email', $invitation->email);
+        TeamFolderInvitation $invitation,
+        ClearActionInInvitationNotificationAction $clearActionInInvitationNotification,
+    ): ResponseFactory|Response {
+        $user = User::where('email', $invitation->email)
+            ->first();
+
+        if ($user) {
+            if (is_demo_account()) {
+                return response('Done', 204);
+            }
 
-        if ($user->exists()) {
             $invitation->accept();
 
             // Store team member
             TeamFolderMember::create([
-                'user_id'    => $user->first()->id,
+                'user_id'    => $user->id,
                 'parent_id'  => $invitation->parent_id,
                 'permission' => $invitation->permission,
             ]);
+
+            // Clear action in existing notification
+            $clearActionInInvitationNotification($user, $invitation);
         }
 
-        if ($user->doesntExist()) {
+        if (! $user) {
             $invitation->update([
                 'status' => 'waiting-for-registration',
             ]);
@@ -46,10 +56,24 @@ class InvitationsController extends Controller
     }
 
     public function destroy(
-        TeamFolderInvitation $invitation
-    ): ResponseFactory | Response {
+        TeamFolderInvitation $invitation,
+        ClearActionInInvitationNotificationAction $clearActionInInvitationNotification,
+    ): ResponseFactory|Response {
         $invitation->reject();
 
+        // Get user from invitation
+        $user = User::where('email', $invitation->email)
+            ->first();
+
+        // Clear action in existing notification
+        if ($user) {
+            if (is_demo_account()) {
+                return response('Done', 204);
+            }
+
+            $clearActionInInvitationNotification($user, $invitation);
+        }
+
         return response('Done', 204);
     }
 }
diff --git a/src/Domain/Teams/Controllers/TeamFoldersController.php b/src/Domain/Teams/Controllers/TeamFoldersController.php
index 9ab72ca8..cc3f20f0 100644
--- a/src/Domain/Teams/Controllers/TeamFoldersController.php
+++ b/src/Domain/Teams/Controllers/TeamFoldersController.php
@@ -44,7 +44,7 @@ class TeamFoldersController extends Controller
                 ->get();
         }
 
-        if (!$id) {
+        if (! $id) {
             $folders = Folder::where('parent_id', null)
                 ->where('team_folder', true)
                 ->where('user_id', Auth::id())
diff --git a/src/Domain/Teams/Notifications/InvitationIntoTeamFolder.php b/src/Domain/Teams/Notifications/InvitationIntoTeamFolder.php
index e705ab65..bd1d9b51 100644
--- a/src/Domain/Teams/Notifications/InvitationIntoTeamFolder.php
+++ b/src/Domain/Teams/Notifications/InvitationIntoTeamFolder.php
@@ -5,10 +5,11 @@ use App\Users\Models\User;
 use Illuminate\Bus\Queueable;
 use Domain\Folders\Models\Folder;
 use Illuminate\Notifications\Notification;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Domain\Teams\Models\TeamFolderInvitation;
 use Illuminate\Notifications\Messages\MailMessage;
 
-class InvitationIntoTeamFolder extends Notification
+class InvitationIntoTeamFolder extends Notification implements ShouldQueue
 {
     use Queueable;
 
@@ -23,7 +24,7 @@ class InvitationIntoTeamFolder extends Notification
      */
     public function via(): array
     {
-        return ['mail'];
+        return ['mail', 'database', 'broadcast'];
     }
 
     /**
@@ -51,4 +52,22 @@ class InvitationIntoTeamFolder extends Notification
             ->action('Join & Create an Account', url('/team-folder-invitation', ['id' => $this->invitation->id]))
             ->salutation("Regards, $appTitle");
     }
+
+    /**
+     * Get the array representation of the notification.
+     */
+    public function toArray(mixed $notifiable): array
+    {
+        return [
+            'type'        => 'team-invitation',
+            'title'       => 'New Team Invitation',
+            'description' => "{$this->invitation->inviter->settings->name} invite you to join into Team Folder.",
+            'action'      => [
+                'type'   => 'invitation',
+                'params' => [
+                    'id' => $this->invitation->id,
+                ],
+            ],
+        ];
+    }
 }
diff --git a/src/Domain/UploadRequest/Controllers/CreateUploadRequestController.php b/src/Domain/UploadRequest/Controllers/CreateUploadRequestController.php
index 034593c4..a30983ae 100644
--- a/src/Domain/UploadRequest/Controllers/CreateUploadRequestController.php
+++ b/src/Domain/UploadRequest/Controllers/CreateUploadRequestController.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\UploadRequest\Controllers;
 
 use Auth;
diff --git a/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php b/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php
index 70c44987..e8457a19 100644
--- a/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php
+++ b/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php
@@ -1,12 +1,12 @@
 <?php
 namespace Domain\UploadRequest\Controllers;
 
-use Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification;
 use Illuminate\Http\Response;
 use Domain\UploadRequest\Models\UploadRequest;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\UploadRequest\Resources\UploadRequestResource;
+use Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification;
 
 class SetUploadRequestAsFilledController
 {
@@ -17,7 +17,7 @@ class SetUploadRequestAsFilledController
         ]);
 
         // Send user notification
-        if (!is_demo_account()) {
+        if (! is_demo_account()) {
             $uploadRequest->user->notify(new UploadRequestFulfilledNotification($uploadRequest));
         }
 
diff --git a/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php b/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
index c83b86d8..d50e63b8 100644
--- a/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
+++ b/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\UploadRequest\Controllers;
 
 use DB;
@@ -14,7 +13,8 @@ class UploadFilesForUploadRequestController
 {
     public function __construct(
         private UploadFileAction $uploadFile,
-    ) {}
+    ) {
+    }
 
     /**
      * @throws FileNotFoundException
diff --git a/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php b/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php
index 9aae3c77..cee2d13b 100644
--- a/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php
+++ b/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\UploadRequest\Notifications;
 
 use Illuminate\Bus\Queueable;
@@ -19,7 +18,8 @@ class UploadRequestFulfilledNotification extends Notification implements ShouldQ
      */
     public function __construct(
         public UploadRequest $uploadRequest
-    ) {}
+    ) {
+    }
 
     /**
      * Get the notification's delivery channels.
@@ -38,7 +38,7 @@ class UploadRequestFulfilledNotification extends Notification implements ShouldQ
         return (new MailMessage)
             ->subject("Your file request was fulfilled in your '{$this->uploadRequest->parent->name}' folder")
             ->greeting('Hello')
-            ->line("We are emailing you because your file request was fulfilled. Please click on the link below to show uploaded files.")
+            ->line('We are emailing you because your file request was fulfilled. Please click on the link below to show uploaded files.')
             ->action('Show Files', url("/platform/files/{$this->uploadRequest->id}"))
             ->line('Thank you for using our application!');
     }
diff --git a/src/Domain/UploadRequest/Requests/StoreUploadRequest.php b/src/Domain/UploadRequest/Requests/StoreUploadRequest.php
index c7624be3..44c9c0b0 100644
--- a/src/Domain/UploadRequest/Requests/StoreUploadRequest.php
+++ b/src/Domain/UploadRequest/Requests/StoreUploadRequest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\UploadRequest\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/src/Domain/UploadRequest/Resources/UploadRequestResource.php b/src/Domain/UploadRequest/Resources/UploadRequestResource.php
index 6072c23d..bcef79eb 100644
--- a/src/Domain/UploadRequest/Resources/UploadRequestResource.php
+++ b/src/Domain/UploadRequest/Resources/UploadRequestResource.php
@@ -28,9 +28,9 @@ class UploadRequestResource extends JsonResource
                             'id'         => $this->user->id,
                             'type'       => 'user',
                             'attributes' => [
-                                'name'   => $this->user->settings->first_name,
+                                'name'    => $this->user->settings->first_name,
                                 'color'   => $this->user->settings->color,
-                                'avatar' => $this->user->settings->avatar,
+                                'avatar'  => $this->user->settings->avatar,
                             ],
                         ],
                     ],
diff --git a/src/Support/Middleware/AdminCheck.php b/src/Support/Middleware/AdminCheck.php
index 0870c6db..7eac81ad 100644
--- a/src/Support/Middleware/AdminCheck.php
+++ b/src/Support/Middleware/AdminCheck.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Support\Middleware;
 
 use Closure;
@@ -16,7 +15,7 @@ class AdminCheck
     public function handle($request, Closure $next)
     {
         // Check if user have access to administration settings
-        if ( $request->user()->role !== 'admin') {
+        if ($request->user()->role !== 'admin') {
             abort(403, 'You don\'t have access for this operation!');
         }
 
diff --git a/src/Support/Middleware/TrustProxies.php b/src/Support/Middleware/TrustProxies.php
index 93dd63a0..bf6cd065 100644
--- a/src/Support/Middleware/TrustProxies.php
+++ b/src/Support/Middleware/TrustProxies.php
@@ -1,8 +1,8 @@
 <?php
 namespace Support\Middleware;
 
-use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index 7318b95b..53da0d1a 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -27,9 +27,13 @@ if (! function_exists('getListOfLatestLogs')) {
         return array_slice(
             array_reverse(
                 array_filter(
-                    scandir(storage_path() . '/logs'), fn($fn) => !str_starts_with($fn, '.')
+                    scandir(storage_path() . '/logs'),
+                    fn ($fn) => ! str_starts_with($fn, '.')
                 )
-            ), 0, 5, true
+            ),
+            0,
+            5,
+            true
         );
     }
 }
@@ -687,6 +691,7 @@ if (! function_exists('mapTrafficRecords')) {
                 $records->add($record);
             }
         }
+
         return $records;
     }
 }
@@ -1126,13 +1131,13 @@ if (! function_exists('replace_occurrence')) {
         }
     }
 
-    if (!function_exists('formatGPSCoordinates')) {
+    if (! function_exists('formatGPSCoordinates')) {
         /**
          * Format GPS coordinates
          */
         function formatGPSCoordinates($coordinates, $ref): string|null
         {
-            if (!$coordinates && !$ref) {
+            if (! $coordinates && ! $ref) {
                 return null;
             }
 
diff --git a/tests/Domain/Files/FileTest.php b/tests/Domain/Files/FileTest.php
index 9a23f4ce..b5c9c557 100644
--- a/tests/Domain/Files/FileTest.php
+++ b/tests/Domain/Files/FileTest.php
@@ -386,12 +386,11 @@ class FileTest extends TestCase
             });
     }
 
-     /**
-     * @test
-     */
+    /**
+    * @test
+    */
     public function it_store_file_exif_data_after_file_upload()
     {
-        
         $file = UploadedFile::fake()
             ->image('fake-image.jpg', 2000, 2000);
 
@@ -417,5 +416,4 @@ class FileTest extends TestCase
             'width'   => 2000,
         ]);
     }
-
 }
diff --git a/tests/Domain/Notifications/NotificationsTest.php b/tests/Domain/Notifications/NotificationsTest.php
index 0f1fb42e..3cbe1227 100644
--- a/tests/Domain/Notifications/NotificationsTest.php
+++ b/tests/Domain/Notifications/NotificationsTest.php
@@ -1,11 +1,10 @@
 <?php
-
 namespace Tests\Domain\Notifications;
 
-use App\Users\Models\User;
-use Tests\TestCase;
-use Str;
 use DB;
+use Str;
+use Tests\TestCase;
+use App\Users\Models\User;
 
 class NotificationsTest extends TestCase
 {
@@ -131,4 +130,4 @@ class NotificationsTest extends TestCase
 
         $this->assertDatabaseCount('notifications', 0);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Domain/Settings/SettingsTest.php b/tests/Domain/Settings/SettingsTest.php
index aa244a80..d1be9796 100644
--- a/tests/Domain/Settings/SettingsTest.php
+++ b/tests/Domain/Settings/SettingsTest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Tests\Domain\Settings;
 
 use Storage;
diff --git a/tests/Domain/Teams/TeamManagementTest.php b/tests/Domain/Teams/TeamManagementTest.php
index b13f7c73..34be6f64 100644
--- a/tests/Domain/Teams/TeamManagementTest.php
+++ b/tests/Domain/Teams/TeamManagementTest.php
@@ -62,11 +62,41 @@ class TeamManagementTest extends TestCase
                 'permission' => 'can-view',
             ]);
 
+        DB::table('notifications')
+            ->insert([
+                'id'              => Str::uuid(),
+                'type'            => 'Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification',
+                'notifiable_type' => 'App\Users\Models\User',
+                'notifiable_id'   => $member->id,
+                'data'            => json_encode([
+                    'type'        => 'team-invitation',
+                    'title'       => 'New Team Invitation',
+                    'description' => 'Jane Doe invite you to join into Team Folder..',
+                    'action'      => [
+                        'type'   => 'invitation',
+                        'params' => [
+                            'type'   => 'invitation',
+                            'params' => [
+                                'id' => $invitation->id,
+                            ],
+                        ],
+                    ],
+                ]),
+                'created_at'      => now(),
+                'updated_at'      => now(),
+            ]);
+
         $this
             ->actingAs($member)
             ->putJson("/api/teams/invitations/{$invitation->id}")
             ->assertNoContent();
 
+        // Get notification
+        $notification = json_decode(DB::table('notifications')->first()->data);
+
+        // Check if action is null
+        $this->assertEquals(null, $notification->action);
+
         $this
             ->assertDatabaseHas('team_folder_invitations', [
                 'parent_id' => $folder->id,
@@ -174,11 +204,41 @@ class TeamManagementTest extends TestCase
                 'permission' => 'can-edit',
             ]);
 
+        DB::table('notifications')
+            ->insert([
+                'id'              => Str::uuid(),
+                'type'            => 'Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification',
+                'notifiable_type' => 'App\Users\Models\User',
+                'notifiable_id'   => $member->id,
+                'data'            => json_encode([
+                    'type'        => 'team-invitation',
+                    'title'       => 'New Team Invitation',
+                    'description' => 'Jane Doe invite you to join into Team Folder..',
+                    'action'      => [
+                        'type'   => 'invitation',
+                        'params' => [
+                            'type'   => 'invitation',
+                            'params' => [
+                                'id' => $invitation->id,
+                            ],
+                        ],
+                    ],
+                ]),
+                'created_at'      => now(),
+                'updated_at'      => now(),
+            ]);
+
         $this
             ->actingAs($member)
             ->deleteJson("/api/teams/invitations/{$invitation->id}")
             ->assertNoContent();
 
+        // Get notification
+        $notification = json_decode(DB::table('notifications')->first()->data);
+
+        // Check if action is null
+        $this->assertEquals(null, $notification->action);
+
         $this
             ->assertDatabaseHas('team_folder_invitations', [
                 'parent_id' => $folder->id,
diff --git a/tests/Domain/UploadRequest/UploadRequestTest.php b/tests/Domain/UploadRequest/UploadRequestTest.php
index fd3037d0..a0459a6e 100644
--- a/tests/Domain/UploadRequest/UploadRequestTest.php
+++ b/tests/Domain/UploadRequest/UploadRequestTest.php
@@ -1,8 +1,6 @@
 <?php
-
 namespace Tests\Domain\UploadRequest;
 
-use Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification;
 use Storage;
 use Notification;
 use Tests\TestCase;
@@ -12,6 +10,7 @@ use Illuminate\Http\UploadedFile;
 use Domain\UploadRequest\Models\UploadRequest;
 use Support\Scheduler\Actions\ExpireUnfilledUploadRequestAction;
 use Domain\UploadRequest\Notifications\UploadRequestNotification;
+use Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification;
 
 class UploadRequestTest extends TestCase
 {