fix: additional token loading conditions

micwallace · micwallace · commit 1f9b2f025b2d · 2024-10-25T16:08:50.000+11:00
diff --git a/javascript/tokenscript-viewer/src/integration/discoveryAdapter.ts b/javascript/tokenscript-viewer/src/integration/discoveryAdapter.ts
@@ -39,6 +39,8 @@ export class DiscoveryAdapter implements ITokenDiscoveryAdapter {
 		const walletAddress = await this.getCurrentWalletAddress();
 		const params = getTokenUrlParams(null, false);
 
+		console.log("PARAMS: ", params);
+
 		for (const initToken of initialTokenDetails){
 
 			try {
@@ -50,12 +52,13 @@ export class DiscoveryAdapter implements ITokenDiscoveryAdapter {
 				}
 
 				if (
+					params.tokenId &&
 					cachedToken.tokenType !== "erc20" &&
 					(
 						params.originId === cachedToken.originId ||
 						(
 							params.contract &&
-							params.tokenId && params.contract.toLowerCase() === cachedToken.contractAddress &&
+							params.contract.toLowerCase() === cachedToken.contractAddress.toLowerCase() &&
 							params.chain === cachedToken.chainId
 						)
 					)

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ export class DiscoveryAdapter implements ITokenDiscoveryAdapter {`
`39`	`39`	`const walletAddress = await this.getCurrentWalletAddress();`
`40`	`40`	`const params = getTokenUrlParams(null, false);`
`41`	`41`
	`42`	`+ console.log("PARAMS: ", params);`
	`43`	`+`
`42`	`44`	`for (const initToken of initialTokenDetails){`
`43`	`45`
`44`	`46`	`try {`
`@@ -50,12 +52,13 @@ export class DiscoveryAdapter implements ITokenDiscoveryAdapter {`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`if (`
	`55`	`+ params.tokenId &&`
`53`	`56`	`cachedToken.tokenType !== "erc20" &&`
`54`	`57`	`(`
`55`	`58`	`params.originId === cachedToken.originId \|\|`
`56`	`59`	`(`
`57`	`60`	`params.contract &&`
`58`		`- params.tokenId && params.contract.toLowerCase() === cachedToken.contractAddress &&`
	`61`	`+ params.contract.toLowerCase() === cachedToken.contractAddress.toLowerCase() &&`
`59`	`62`	`params.chain === cachedToken.chainId`
`60`	`63`	`)`
`61`	`64`	`)`