add: showing error in modal

nightly-labs · Feb 23, 2024 · 7cff49a · 7cff49a
1 parent ae9b42a
commit 7cff49a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/sdk/packages/modal/src/components/nightly-desktop-main/nightly-desktop-main.stories.ts b/sdk/packages/modal/src/components/nightly-desktop-main/nightly-desktop-main.stories.ts
@@ -154,7 +154,7 @@ export const Error: Story = (args: NightlyModalArgs) => {
 
   if (!args.sessionId)
     setTimeout(() => {
-      updateArgs({ timeoutError: true })
+      updateArgs({ timeoutError: 'error' })
     }, 5000)
 
   return html`<nightly-desktop-main

diff --git a/sdk/packages/modal/src/components/nightly-desktop-main/nightly-desktop-main.ts b/sdk/packages/modal/src/components/nightly-desktop-main/nightly-desktop-main.ts
@@ -32,8 +32,8 @@ export class NightlyDesktopMain extends LitElement {
   @property({ type: Object })
   qrConfigOverride: Partial<XMLOptions> = {}
 
-  @property({ type: Boolean })
-  timeoutError = false
+  @property({ type: String })
+  timeoutError = ''
 
   @state()
   copyMessage = 'Copy'

diff --git a/sdk/packages/modal/src/components/nightly-mobile-qr/nightly-mobile-qr.ts b/sdk/packages/modal/src/components/nightly-mobile-qr/nightly-mobile-qr.ts
@@ -24,8 +24,8 @@ export class NightlyMobileQr extends LitElement {
   @property({ type: Object })
   qrConfigOverride: Partial<XMLOptions> = {}
 
-  @property({ type: Boolean })
-  timeoutError = false
+  @property({ type: String })
+  timeoutError = ''
 
   @state()
   qrSource: string | undefined = undefined

diff --git a/sdk/packages/modal/src/components/nightly-selector/nightly-selector.stories.ts b/sdk/packages/modal/src/components/nightly-selector/nightly-selector.stories.ts
@@ -159,7 +159,7 @@ export const Error: Story = (args: NightlyModalArgs) => {
 
   if (!args.sessionId)
     setTimeout(() => {
-      updateArgs({ timeoutError: true })
+      updateArgs({ timeoutError: 'error' })
     }, 5000)
 
   return open

diff --git a/sdk/packages/modal/src/components/nightly-selector/nightly-selector.ts b/sdk/packages/modal/src/components/nightly-selector/nightly-selector.ts
@@ -47,8 +47,8 @@ export class NightlySelector extends LitElement {
   @property({ type: Object })
   qrConfigOverride: Partial<XMLOptions> = {}
 
-  @property({ type: Boolean })
-  timeoutError = false
+  @property({ type: String })
+  timeoutError = ''
 
   // state
 

diff --git a/sdk/packages/selector-base/src/modal.ts b/sdk/packages/selector-base/src/modal.ts
@@ -61,6 +61,10 @@ export class NightlyConnectSelectorModal {
     if (this._modal && id) this._modal.sessionId = id
   }
 
+  set timeoutError(error: string) {
+    if (this._modal && error) this._modal.timeoutError = error
+  }
+
   createSelectorElement = (
     variablesOverride?: object,
     stylesOverride?: string,

diff --git a/sdk/packages/selector-polkadot/src/adapter.ts b/sdk/packages/selector-polkadot/src/adapter.ts
@@ -161,7 +161,7 @@ export class NightlyConnectAdapter implements Injected {
     )
     if (!adapter._connectionOptions.disableModal) {
       adapter._modal = new NightlyConnectSelectorModal(
-        adapter.walletsList as IWalletListItem[],
+        adapter.walletsList,
         appInitData.url ?? 'https://nc2.nightly.app',
         networkToData(adapter.network),
         anchorRef,
@@ -553,7 +553,7 @@ export class NightlyConnectAdapter implements Injected {
               if (checks > 500) {
                 clearInterval(loadingInterval)
                 // reject(new Error('Connecting takes too long'))
-                // TODO we need to have a way to show error on modal
+                if (this._modal) this._modal.timeoutError = 'Connecting is taking too long'
               }
             }, 10)
           }

diff --git a/sdk/packages/selector-solana/src/adapter.ts b/sdk/packages/selector-solana/src/adapter.ts
@@ -588,7 +588,7 @@ export class NightlyConnectAdapter extends BaseMessageSignerWalletAdapter {
               if (checks > 500) {
                 clearInterval(loadingInterval)
                 // reject(new Error('Connecting takes too long'))
-                // TODO we need to have a way to show error on modal
+                if (this._modal) this._modal.timeoutError = 'Connecting is taking too long'
               }
             }, 10)
           }