Merge pull request #200 from tonkeeper/fix/deeplink-transafer-withgoback

fix: transfer deeplink withGoBack
tonkeeper · Dec 29, 2022 · 2d6af4e · 2d6af4e
2 parents 3cb04b8 + db7a17e
commit 2d6af4e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         applicationId 'com.ton_keeper'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 261
-        versionName "2.8.0"
+        versionCode 262
+        versionName "2.8.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         missingDimensionStrategy 'react-native-camera', 'general'
 

diff --git a/ios/ton_keeper.xcodeproj/project.pbxproj b/ios/ton_keeper.xcodeproj/project.pbxproj
@@ -1174,7 +1174,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ton_keeper/ton_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 261;
+				CURRENT_PROJECT_VERSION = 262;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = CT523DK2KC;
 				ENABLE_BITCODE = NO;
@@ -1184,7 +1184,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8.0;
+				MARKETING_VERSION = 2.8.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1209,7 +1209,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ton_keeper/ton_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 261;
+				CURRENT_PROJECT_VERSION = 262;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = CT523DK2KC;
 				INFOPLIST_FILE = ton_keeper/SupportingFiles/Info.plist;
@@ -1218,7 +1218,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8.0;
+				MARKETING_VERSION = 2.8.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/src/navigation/hooks/useDeeplinkingResolvers.ts b/src/navigation/hooks/useDeeplinkingResolvers.ts
@@ -177,6 +177,7 @@ export function useDeeplinkingResolvers() {
                   modalName: ModalName.CONFIRM_SENDING,
                   key: 'CONFIRM_SENDING',
                   ...options,
+                  withGoBack: resolveParams.withGoBack ?? false
                 });
               }
             },
@@ -189,7 +190,7 @@ export function useDeeplinkingResolvers() {
       }
       openSend(query.jetton, address, comment, resolveParams.withGoBack, true);
     } else {
-      openSend(currency, address, comment);
+      openSend(currency, address, comment, false);
     }
   });