fix: erc20 image issue & tokenId loading issue

Author: micwallace

javascript/engine-js/src/AbstractTokenScript.ts

@@ -289,7 +289,7 @@ export abstract class AbstractTokenScript implements ITokenScript {
 
 			const balance = tokenContext.balance ? tokenContext.balance.toString() : "0"; // bigint can't be json serialized, so it must always be string
 
-			const image = this.getMetadata().imageUrl ?? tokenDetails?.image ?? this.getMetadata().iconUrl;
+			const image = this.getMetadata().imageUrl ?? tokenDetails?.image ?? tokenContext.image ?? this.getMetadata().iconUrl;
 
 			data = {
 				name: tokenDetails?.name ?? tokenContext.name,
@@ -304,6 +304,7 @@ export abstract class AbstractTokenScript implements ITokenScript {
 				tokenId: tokenContext.selectedTokenId,
 				ownerAddress: tokenContext.tokenType === "erc20" ? await this.getCurrentWalletAddress() : ZeroAddress,
 				image_preview_url: image,
+				image
 			};
 
 			if (tokenDetails) {

javascript/tokenscript-viewer/src/components/common/tokens-grid/tokens-grid.tsx

@@ -69,11 +69,10 @@ export class TokensGrid {
 
 			if (walletConnection){
 				this.currentWalletAddress = walletConnection.address.toLowerCase();
-				this.tokenScript.getTokenMetadata(true);
 			} else {
 				this.currentWalletAddress = ZeroAddress;
-				this.tokenScript.setTokenMetadata([]);
 			}
+			await this.tokenScript.getTokenMetadata(true);
 		});
 
 		if (Web3WalletProvider.isWalletConnected())