From 34ff8e9a9817eb49c93c0a4805f4bf800b300a7a Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 25 Oct 2024 20:58:17 +0200 Subject: [PATCH] fix rendering glitch with tow step confirmation --- .../components/modal-confirmation.blade.php | 119 +++++++++--------- 1 file changed, 57 insertions(+), 62 deletions(-) diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php index 7cc0dfaa5..36af1c3a2 100644 --- a/resources/views/components/modal-confirmation.blade.php +++ b/resources/views/components/modal-confirmation.blade.php @@ -23,8 +23,8 @@ ]) @php - $settings = instanceSettings(); - $disableTwoStepConfirmation = $settings->disable_two_step_confirmation ?? false; + use App\Models\InstanceSettings; + $disableTwoStepConfirmation = data_get(InstanceSettings::get(), 'disable_two_step_confirmation'); @endphp
@endforeach + +
+ + Cancel + + + + +
@endif @@ -267,6 +277,29 @@ @endif @endif + +
+ + Back + + + + +
@@ -291,68 +324,30 @@

{{ $message }}

@enderror - - @endif - - -
- - - - - - - @if (!$disableTwoStepConfirmation) - + submitForm().then((result) => { + if (result === true) { + modalOpen = false; + resetModal(); + } else { + passwordError = result; + password = ''; // Clear the password field + } + }); + "> + + +
+ @endif