From 19f3695f99d83213b29f81cb3a0fb22b0b8a8b99 Mon Sep 17 00:00:00 2001
From: Francisco <jscriptcoder@gmail.com>
Date: Fri, 31 Mar 2023 00:08:41 +0200
Subject: [PATCH 1/3] Fix issue with claim notice modal

---
 .../src/components/modals/NoticeModal.svelte  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/bridge-ui/src/components/modals/NoticeModal.svelte b/packages/bridge-ui/src/components/modals/NoticeModal.svelte
index 65b15e44826..78c839a009b 100644
--- a/packages/bridge-ui/src/components/modals/NoticeModal.svelte
+++ b/packages/bridge-ui/src/components/modals/NoticeModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { onMount } from 'svelte';
+  import { onDestroy, onMount } from 'svelte';
   import { localStoragePrefix } from '../../config';
   import Button from '../buttons/Button.svelte';
   import Modal from './Modal.svelte';
@@ -21,6 +21,11 @@
     noShowAgainCheckbox = noShowAgainStorage;
   });
 
+  function closeAndContinue() {
+    show = false;
+    onConfirm?.(noShowAgainCheckbox);
+  }
+
   function onConfirmNotice() {
     if (noShowAgainCheckbox) {
       // If checkbox is checked, store it in localStorage so
@@ -29,9 +34,18 @@
       noShowAgainStorage = true;
     }
 
-    show = false;
+    closeAndContinue();
+  }
 
-    onConfirm?.(noShowAgainCheckbox);
+  // It could happen that the modal is being opened via prop, but the user
+  // already opted out of seeing the message (we have localStorage set).
+  // In that case, we still want to run the onConfirm callback, which contains
+  // the next steps in the flow, also setting the prop back to false
+  // (could be bound to the parent)
+  // TODO: use promises here. API to open the modal should return a promise
+  //       which resolves when the user clicks on confirm.
+  $: if (show && noShowAgainStorage) {
+    closeAndContinue();
   }
 </script>
 

From 75b221d9fa592b69a20d282680ec0505c4a3ba97 Mon Sep 17 00:00:00 2001
From: Francisco <jscriptcoder@gmail.com>
Date: Fri, 31 Mar 2023 00:19:37 +0200
Subject: [PATCH 2/3] No need for onDestroy

---
 packages/bridge-ui/src/components/modals/NoticeModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bridge-ui/src/components/modals/NoticeModal.svelte b/packages/bridge-ui/src/components/modals/NoticeModal.svelte
index 78c839a009b..c10841af70d 100644
--- a/packages/bridge-ui/src/components/modals/NoticeModal.svelte
+++ b/packages/bridge-ui/src/components/modals/NoticeModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { onDestroy, onMount } from 'svelte';
+  import { onMount } from 'svelte';
   import { localStoragePrefix } from '../../config';
   import Button from '../buttons/Button.svelte';
   import Modal from './Modal.svelte';

From fd0220fe1c2a06ca89dd928792c804e3062980f5 Mon Sep 17 00:00:00 2001
From: Francisco <jscriptcoder@gmail.com>
Date: Fri, 31 Mar 2023 00:21:23 +0200
Subject: [PATCH 3/3] Add more comments

---
 packages/bridge-ui/src/components/modals/NoticeModal.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/bridge-ui/src/components/modals/NoticeModal.svelte b/packages/bridge-ui/src/components/modals/NoticeModal.svelte
index c10841af70d..ff89da58930 100644
--- a/packages/bridge-ui/src/components/modals/NoticeModal.svelte
+++ b/packages/bridge-ui/src/components/modals/NoticeModal.svelte
@@ -43,7 +43,8 @@
   // the next steps in the flow, also setting the prop back to false
   // (could be bound to the parent)
   // TODO: use promises here. API to open the modal should return a promise
-  //       which resolves when the user clicks on confirm.
+  //       which resolves when the user clicks on confirm. If noShowAgain is set
+  //       to true, the promise should resolve immediately.
   $: if (show && noShowAgainStorage) {
     closeAndContinue();
   }