Merge pull request #834 from TokenScript/fix/ensure-toggle-index

ensure a toggle index is present with custom tokens
SmartTokenLabs · Sep 20, 2023 · a4efb49 · a4efb49
2 parents bc49599 + 96871bc
commit a4efb49
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
@@ -186,11 +186,10 @@ export class SelectIssuers extends AbstractView {
 					data-issuer="${issuer}"
 					${this.client.issuersLoaded === true ? '' : 'disabled'}
 				>
-				${
-					this.client.issuersLoaded === true
-						? this.params.options.loadAction ?? 'Load'
-						: '<div class="lds-ellipsis lds-ellipsis-sm" style=""><div></div><div></div><div></div><div></div></div>'
-				}
+				${this.client.issuersLoaded === true
+				? this.params.options.loadAction ?? 'Load'
+				: '<div class="lds-ellipsis lds-ellipsis-sm" style=""><div></div><div></div><div></div><div></div></div>'
+			}
 			  </button>
               <button aria-label="tokens available from token issuer ${issuer}" 
 										  aria-haspopup="true"
@@ -220,7 +219,7 @@ export class SelectIssuers extends AbstractView {
 						this.issuerListContainer,
 						`[data-issuer="${issuer}"] .connect-btn-tn`,
 						this.params.options.loadAction ?? 'Load',
-					) 
+					)
 					return
 				}
 
@@ -251,15 +250,15 @@ export class SelectIssuers extends AbstractView {
 				this.issuerListContainer,
 				`[data-issuer="${issuer}"] .connect-btn-tn`,
 				this.params.options.repeatAction ?? 'Try Again',
-			) 
+			)
 			return
 		}
 
 		this.ui.dismissLoader()
 
 		if (!tokens?.length) {
 			this.ui.showError(`
-			${this.params.options.noTokensFoundEvent ?? 'No tokens found! ' }
+			${this.params.options.noTokensFoundEvent ?? 'No tokens found! '}
 			${this.client.getNoTokenMsg(issuer)}`)
 			applyHTMLElementsInnerText(
 				this.issuerListContainer,
@@ -344,19 +343,18 @@ export class SelectIssuers extends AbstractView {
 
 			if (config.onChain === false) {
 				const { title, image } = config
-
+				const tokenId = t.tokenId ?? t.ticketId ?? i.toString();
 				tokens.push(<TokenListItemInterface>{
 					data: t,
 					tokenIssuerKey: issuer,
-					index: t.ticketId,
+					index: tokenId,
 					title: title,
 					image: image,
 					toggleState: isSelected,
 					hideToggle: config?.hideToggle,
 				})
 			} else {
 				const tokenId = t.tokenId ?? i.toString()
-
 				tokens.push({
 					data: t,
 					tokenIssuerKey: issuer,