fix: merge error & add security status & action reload to STS viewer

SmartTokenLabs · Nov 9, 2023 · 997eb73 · 997eb73
1 parent f3947b3
commit 997eb73
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/javascript/engine-js/src/tokenScript/Origin.ts b/javascript/engine-js/src/tokenScript/Origin.ts
@@ -70,6 +70,8 @@ export class Origin {
 				// const dsigKeyOrAddress = contractKey.valueType === "ethAddress" ? ethers.utils.computeAddress(publicKeyHex) : publicKeyHex;
 
 				const dSigAddress = ethers.utils.computeAddress(publicKeyHex);
+
+				// TODO: Check signer key as well as authoritative key
 				const isAdmin = await (new ContractKeyResolver(this.tokenScript).isAdmin(contract, dSigAddress));
 
 				// console.log("DSIG validator: revolved contract deployment key: ", contractKey);
@@ -87,7 +89,7 @@ export class Origin {
 					console.warn(`DSIG validator: contract key does not match DSIG( publicKeyHex: ${publicKeyHex}, address: ${dSigAddress})`);
 				}
 
-				this.signingKey = contractKey.value;
+				this.signingKey = dSigAddress;
 
 			} catch (e) {
 				console.warn(e);

diff --git a/javascript/tokenscript-viewer/src/components/viewers/sts-token/sts-viewer.tsx b/javascript/tokenscript-viewer/src/components/viewers/sts-token/sts-viewer.tsx
@@ -144,6 +144,13 @@ export class SmartTokenStoreViewer {
 				tokenScript.setCurrentTokenContext(selectedOrigin.originId, 0);
 				this.tokenScript = tokenScript;
 
+				// Reload cards after the token is updated
+				this.tokenScript.on("TOKENS_UPDATED", (data) => {
+					this.cardButtons = null;
+					this.overflowCardButtons = null;
+					this.loadCards();
+				}, "grid")
+
 				this.loadCards();
 			}
 
@@ -285,6 +292,9 @@ export class SmartTokenStoreViewer {
 								] : ''
 							}
 						</div>
+						<div style={{padding: "0 10px"}}>
+							{this.tokenScript ? <security-status tokenScript={this.tokenScript}/> : ''}
+						</div>
 					</div>
 					) : '' }
 				</div>