From 117a332f139f9fd5b4dc55e33996948aee8998c6 Mon Sep 17 00:00:00 2001 From: Calvin Chang Date: Fri, 12 Jan 2024 14:37:02 +0800 Subject: [PATCH] fix: aptos handle existSDK window not defined --- packages/blocto-sdk/src/providers/aptos.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/blocto-sdk/src/providers/aptos.ts b/packages/blocto-sdk/src/providers/aptos.ts index fe70100d..a670cc7d 100644 --- a/packages/blocto-sdk/src/providers/aptos.ts +++ b/packages/blocto-sdk/src/providers/aptos.ts @@ -67,6 +67,7 @@ export default class AptosProvider sessionKey: KEY_SESSION; private get existedSDK() { + if (typeof window === 'undefined') return undefined; return (window as any).bloctoAptos; } @@ -147,7 +148,6 @@ export default class AptosProvider transaction: AptosTypes.TransactionPayload, txOptions: TxOptions = {} ): Promise<{ hash: AptosTypes.HexEncodedBytes }> { - if (this.existedSDK) { return this.existedSDK.signAndSubmitTransaction(transaction, txOptions); } @@ -217,7 +217,6 @@ export default class AptosProvider } async signMessage(payload: SignMessagePayload): Promise { - const formattedPayload = checkMessagePayloadFormat(payload); if (this.existedSDK) { @@ -291,7 +290,10 @@ export default class AptosProvider if (this.existedSDK) { return new Promise((resolve, reject) => // add a small delay to make sure the network has been switched - setTimeout(() => this.existedSDK.connect().then(resolve).catch(reject), 10) + setTimeout( + () => this.existedSDK.connect().then(resolve).catch(reject), + 10 + ) ); } @@ -406,18 +408,16 @@ export default class AptosProvider } override on(event: string, listener: (arg: any) => void): void { - if (this.existedSDK) - this.existedSDK.on(event, listener); - + if (this.existedSDK) this.existedSDK.on(event, listener); + super.on(event, listener); } - + override removeListener(event: string, listener: (arg: any) => void): void { - if (this.existedSDK) - this.existedSDK.off(event, listener); - + if (this.existedSDK) this.existedSDK.off(event, listener); + super.removeListener(event, listener); } - + off = this.removeListener; }