Skip to content

Commit d27090c

Browse files
committed
Add loading spinner for when wallet check modal is loading
1 parent d88c753 commit d27090c

File tree

2 files changed

+52
-47
lines changed

2 files changed

+52
-47
lines changed

src/components/Modal.svelte

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { fade } from 'svelte/transition'
33
import { app } from '../stores'
44
export let closeModal: () => void
5+
export let closeable: boolean = true
56
67
let closeHovered: boolean
78
</script>
@@ -84,47 +85,49 @@
8485
class:bn-onboard-dark-mode={$app.darkMode}
8586
class="bn-onboard-custom bn-onboard-modal-content">
8687
<slot />
87-
<div
88-
class="bn-onboard-custom bn-onboard-modal-content-close"
89-
class:bn-onboard-dark-mode-close-background={$app.darkMode}
90-
on:click={closeModal}
91-
on:mouseenter={() => (closeHovered = true)}
92-
on:mouseleave={() => (closeHovered = false)}>
93-
<svg
94-
version="1.1"
95-
id="Capa_1"
96-
xmlns="http://www.w3.org/2000/svg"
97-
xmlns:xlink="http://www.w3.org/1999/xlink"
98-
x="0px"
99-
y="0px"
100-
viewBox="0 0 47.971 47.971"
101-
style="enable-background:new 0 0 47.971 47.971; transition: fill 150ms
102-
ease-in-out;"
103-
fill={closeHovered ? ($app.darkMode ? '#ffffff' : '#4a4a4a') : '#9B9B9B'}
104-
xml:space="preserve">
105-
<g>
106-
<path
107-
d="M28.228,23.986L47.092,5.122c1.172-1.171,1.172-3.071,0-4.242c-1.172-1.172-3.07-1.172-4.242,0L23.986,19.744L5.121,0.88
108-
c-1.172-1.172-3.07-1.172-4.242,0c-1.172,1.171-1.172,3.071,0,4.242l18.865,18.864L0.879,42.85c-1.172,1.171-1.172,3.071,0,4.242
109-
C1.465,47.677,2.233,47.97,3,47.97s1.535-0.293,2.121-0.879l18.865-18.864L42.85,47.091c0.586,0.586,1.354,0.879,2.121,0.879
110-
s1.535-0.293,2.121-0.879c1.172-1.171,1.172-3.071,0-4.242L28.228,23.986z" />
111-
</g>
112-
<g />
113-
<g />
114-
<g />
115-
<g />
116-
<g />
117-
<g />
118-
<g />
119-
<g />
120-
<g />
121-
<g />
122-
<g />
123-
<g />
124-
<g />
125-
<g />
126-
<g />
127-
</svg>
128-
</div>
88+
{#if closeable}
89+
<div
90+
class="bn-onboard-custom bn-onboard-modal-content-close"
91+
class:bn-onboard-dark-mode-close-background={$app.darkMode}
92+
on:click={closeModal}
93+
on:mouseenter={() => (closeHovered = true)}
94+
on:mouseleave={() => (closeHovered = false)}>
95+
<svg
96+
version="1.1"
97+
id="Capa_1"
98+
xmlns="http://www.w3.org/2000/svg"
99+
xmlns:xlink="http://www.w3.org/1999/xlink"
100+
x="0px"
101+
y="0px"
102+
viewBox="0 0 47.971 47.971"
103+
style="enable-background:new 0 0 47.971 47.971; transition: fill 150ms
104+
ease-in-out;"
105+
fill={closeHovered ? ($app.darkMode ? '#ffffff' : '#4a4a4a') : '#9B9B9B'}
106+
xml:space="preserve">
107+
<g>
108+
<path
109+
d="M28.228,23.986L47.092,5.122c1.172-1.171,1.172-3.071,0-4.242c-1.172-1.172-3.07-1.172-4.242,0L23.986,19.744L5.121,0.88
110+
c-1.172-1.172-3.07-1.172-4.242,0c-1.172,1.171-1.172,3.071,0,4.242l18.865,18.864L0.879,42.85c-1.172,1.171-1.172,3.071,0,4.242
111+
C1.465,47.677,2.233,47.97,3,47.97s1.535-0.293,2.121-0.879l18.865-18.864L42.85,47.091c0.586,0.586,1.354,0.879,2.121,0.879
112+
s1.535-0.293,2.121-0.879c1.172-1.171,1.172-3.071,0-4.242L28.228,23.986z" />
113+
</g>
114+
<g />
115+
<g />
116+
<g />
117+
<g />
118+
<g />
119+
<g />
120+
<g />
121+
<g />
122+
<g />
123+
<g />
124+
<g />
125+
<g />
126+
<g />
127+
<g />
128+
<g />
129+
</svg>
130+
</div>
131+
{/if}
129132
</section>
130133
</aside>

src/views/WalletCheck.svelte

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
let pollingInterval: any
3434
let checkingModule: boolean = false
3535
let actionResolved: boolean | undefined = undefined
36-
let loading: boolean
36+
let loading: boolean = false
3737
3838
// recheck modules if below conditions
3939
$: if (!activeModal && !checkingModule) {
@@ -231,8 +231,8 @@
231231
}
232232
</style>
233233

234-
{#if activeModal}
235-
<Modal closeModal={handleExit}>
234+
<Modal closeModal={handleExit} closeable={!!activeModal}>
235+
{#if activeModal}
236236
<ModalHeader icon={activeModal.icon} heading={activeModal.heading} />
237237
<p class="bn-onboard-custom bn-onboard-prepare-description">
238238
{@html activeModal.description}
@@ -261,5 +261,7 @@
261261
{/if}
262262
<Button onclick={handleExit}>Dismiss</Button>
263263
</div>
264-
</Modal>
265-
{/if}
264+
{:else}
265+
<Spinner />
266+
{/if}
267+
</Modal>

0 commit comments

Comments
 (0)