fix: Fix emulator loading issue

Author: micwallace

javascript/engine-js/src/TokenScript.ts

@@ -122,7 +122,7 @@ export class TokenScript {
 	public getSourceInfo(){
 		return {
 			// TODO: Use better UID for non-resolved tokenscripts
-			tsId: this.sourceId + (this.scriptInfo.scriptId ? '-' + this.scriptInfo.scriptId : '') ?? this.getName(),
+			tsId: this.sourceId + (this.scriptInfo?.scriptId ? '-' + this.scriptInfo.scriptId : '') ?? this.getName(),
 			source: this.source,
 			sourceUrl: this.sourceUrl,
 			scriptInfo: this.scriptInfo

javascript/engine-js/src/tokenScript/Origin.ts

@@ -204,8 +204,6 @@ export class Origin {
 		const scriptSource = this.tokenScript.getSourceInfo();
 		const [chain, contractAddress] = (scriptSource.tsId ?? "").split("-");
 
-		console.log("Script Info ", scriptSource.scriptInfo);
-
 		// The same script Cid should be specified for all addresses in the same contract scriptUri in order to be valid
 		const addresses = contract.getAddresses();
 

javascript/tokenscript-viewer/src/components/viewers/new/viewer-popover/viewer-popover.tsx

@@ -57,6 +57,8 @@ export class ViewerPopover {
 	private overflowCardButtons: JSX.Element[];
 	private overflowDialog: HTMLActionOverflowModalElement;
 
+	@State()
+	private otherScripts: ScriptInfo[];
 
 	@Method()
 	async open(tokenScript: TokenScript){
@@ -76,7 +78,7 @@ export class ViewerPopover {
 			try {
 				const enabled = await card.isEnabledOrReason();
 
-				console.log("Card enabled: ", enabled);
+				//console.log("Card enabled: ", enabled);
 
 				if (enabled === false)
 					continue;
@@ -128,6 +130,21 @@ export class ViewerPopover {
 		location.search = params.toString();
 
 		history.pushState(undefined, undefined, location);
+
+		await this.reloadOtherScripts();
+	}
+
+	private async reloadOtherScripts(){
+		this.otherScripts = null;
+
+		if ([ScriptSourceType.SCRIPT_URI, ScriptSourceType.SCRIPT_REGISTRY].indexOf(this.tokenScript.getSourceInfo().source) === -1)
+			return;
+
+		try {
+			this.otherScripts = await this.tokenScript.getEngine().resolveAllScripts(this.tokenScript.getSourceInfo().tsId);
+		} catch (e){
+			console.warn(e);
+		}
 	}
 
 	private async showCard(card: Card, token?: TokenGridContext, cardIndex?: number){
@@ -192,17 +209,9 @@ export class ViewerPopover {
 						<h3>{this.tokenScript.getLabel(2) ?? this.tokenScript.getName()}</h3>
 					</div>
 					<div class="view-toolbar-buttons">
-						<button class="btn btn-secondary" style={{marginRight: "15px", minWidth: "35px", fontSize: "16px"}} onClick={async () =>{
-							this.showLoader.emit();
-							try {
-								const scripts = await this.tokenScript.getEngine().resolveAllScripts(this.tokenScript.getSourceInfo().tsId);
-								this.showScriptSelector.emit(scripts);
-							} catch (e){
-
-							}
-							this.hideLoader.emit();
-
-						}}>Other TApps</button>
+						{this.otherScripts?.length > 1 ? <button class="btn btn-secondary" style={{marginRight: "15px", minWidth: "35px", fontSize: "16px"}} onClick={async () =>{
+							this.showScriptSelector.emit(this.otherScripts);
+						}}>Other TApps</button> : ''}
 						<share-to-tg-button></share-to-tg-button>
 						<security-status tokenScript={this.tokenScript}/>
 						<div>