diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index d00556bdc854..b57686358775 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -8,12 +8,6 @@
 
 @section('body')
 
-    @if(!$invoice->isApproved() && $client->getSetting('custom_message_unapproved_quote'))
-        @component('portal.ninja2020.components.message')
-            {{ $client->getSetting('custom_message_unapproved_quote') }}
-        @endcomponent
-    @endif
-
     @if(!$invoice->isPayable() && $client->getSetting('custom_message_paid_invoice'))
         @component('portal.ninja2020.components.message')
             {{ $client->getSetting('custom_message_paid_invoice') }}
diff --git a/tests/Feature/GroupSettingTest.php b/tests/Feature/GroupSettingTest.php
index cacff8059168..b99aa2cb7fb0 100644
--- a/tests/Feature/GroupSettingTest.php
+++ b/tests/Feature/GroupSettingTest.php
@@ -23,7 +23,7 @@ use Tests\TestCase;
 class GroupSettingTest extends TestCase
 {
     use MakesHash;
-    use DatabaseTransactions;
+    //use DatabaseTransactions;
     use MockAccountData;
 
     public function setUp(): void
@@ -42,7 +42,7 @@ class GroupSettingTest extends TestCase
     public function testAddGroupSettings()
     {
         $settings = new \stdClass;
-        $settings->currency_id = 1;
+        $settings->currency_id = '1';
 
         $data = [
             'name' => 'testX',
@@ -65,7 +65,7 @@ class GroupSettingTest extends TestCase
     public function testArchiveGroupSettings()
     {
         $settings = new \stdClass;
-        $settings->currency_id = 1;
+        $settings->currency_id = '1';
 
         $data = [
             'name' => 'testY',