Merge pull request #229 from tonkeeper/fix-default-returnStrategy

fix default returnStrategy
tonkeeper · Jan 24, 2023 · 5ff02dc · 5ff02dc
2 parents f86ab74 + e82d0ba
commit 5ff02dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/tonconnect/TonConnectRemoteBridge.ts b/src/tonconnect/TonConnectRemoteBridge.ts
@@ -40,7 +40,7 @@ class TonConnectRemoteBridgeService {
 
   private origin: DeeplinkOrigin | null = null;
 
-  private returnStrategy: ReturnStrategy = null;
+  private returnStrategy: ReturnStrategy = 'back';
 
   public setOrigin(origin: DeeplinkOrigin) {
     this.origin = origin;
@@ -209,7 +209,7 @@ class TonConnectRemoteBridgeService {
     if (this.origin === DeeplinkOrigin.DEEPLINK) {
       if (this.returnStrategy === 'back') {
         Minimizer.goBack();
-      } else if (this.returnStrategy !== null && this.returnStrategy !== 'none') {
+      } else if (this.returnStrategy !== 'none') {
         const url = this.returnStrategy;
 
         Linking.openURL(url).catch((error) =>
@@ -219,7 +219,7 @@ class TonConnectRemoteBridgeService {
     }
 
     this.origin = null;
-    this.returnStrategy = null;
+    this.returnStrategy = 'back';
   }
 
   async handleConnectDeeplink(query: IConnectQrQuery) {

diff --git a/src/tonconnect/models.ts b/src/tonconnect/models.ts
@@ -13,4 +13,4 @@ export interface DAppManifest {
   privacyPolicyUrl?: string;
 }
 
-export type ReturnStrategy = 'back' | 'none' | string | null;
+export type ReturnStrategy = 'back' | 'none' | string;