From 262b05d52fbc5caaffaaf348c66f3ab48cd622bc Mon Sep 17 00:00:00 2001 From: vzhovnitsky Date: Mon, 23 Sep 2024 18:58:02 +0200 Subject: [PATCH 1/7] fix: dont show gasless switch on v4 wallets --- app/fragments/secure/components/TransferSingle.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/fragments/secure/components/TransferSingle.tsx b/app/fragments/secure/components/TransferSingle.tsx index 408519474..24d6e66a6 100644 --- a/app/fragments/secure/components/TransferSingle.tsx +++ b/app/fragments/secure/components/TransferSingle.tsx @@ -459,6 +459,9 @@ export const TransferSingle = memo((props: ConfirmLoadedPropsSingle) => { } }, [registerPending, jettonAmountString, jetton, fees]); + const isGasless = fees.type === 'gasless' && fees.params.ok; + const setUseGasless = isGasless ? onSetUseGasless : undefined; + return ( { isWithStateInit={!!order.messages[0].stateInit} contact={contact} failed={failed} - isGasless={fees.type === 'gasless' && fees.params.ok} - onSetUseGasless={onSetUseGasless} + isGasless={isGasless} + onSetUseGasless={setUseGasless} /> ); }); \ No newline at end of file From 0ae04bfad6f62b8c933db20720dd89446b7350eb Mon Sep 17 00:00:00 2001 From: vzhovnitsky Date: Mon, 23 Sep 2024 19:00:35 +0200 Subject: [PATCH 2/7] v2.3.15 --- VERSION_CODE | 2 +- ios/wallet/Info.plist | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION_CODE b/VERSION_CODE index 6e16ebf9e..274ccca8a 100644 --- a/VERSION_CODE +++ b/VERSION_CODE @@ -1 +1 @@ -208 \ No newline at end of file +209 \ No newline at end of file diff --git a/ios/wallet/Info.plist b/ios/wallet/Info.plist index 82df6798b..4e7713343 100644 --- a/ios/wallet/Info.plist +++ b/ios/wallet/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 2.3.14 + 2.3.15 CFBundleSignature ???? CFBundleURLTypes @@ -41,7 +41,7 @@ CFBundleVersion - 208 + 209 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/package.json b/package.json index 209e38d74..918055f28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wallet", - "version": "2.3.14", + "version": "2.3.15", "scripts": { "start": "expo start --dev-client", "android": "expo run:android", From 39c47f372613c090c280fbc60e990fdd4ffb7886 Mon Sep 17 00:00:00 2001 From: vzhovnitsky Date: Mon, 23 Sep 2024 19:00:45 +0200 Subject: [PATCH 3/7] v2.3.16 --- VERSION_CODE | 2 +- ios/wallet/Info.plist | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION_CODE b/VERSION_CODE index 274ccca8a..55596b29f 100644 --- a/VERSION_CODE +++ b/VERSION_CODE @@ -1 +1 @@ -209 \ No newline at end of file +210 \ No newline at end of file diff --git a/ios/wallet/Info.plist b/ios/wallet/Info.plist index 4e7713343..6b0f7c7d6 100644 --- a/ios/wallet/Info.plist +++ b/ios/wallet/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 2.3.15 + 2.3.16 CFBundleSignature ???? CFBundleURLTypes @@ -41,7 +41,7 @@ CFBundleVersion - 209 + 210 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/package.json b/package.json index 918055f28..a8bd755cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wallet", - "version": "2.3.15", + "version": "2.3.16", "scripts": { "start": "expo start --dev-client", "android": "expo run:android", From bc40e7fc8e1221ce9a7c0e2b6421c6a48060d755 Mon Sep 17 00:00:00 2001 From: vzhovnitsky Date: Mon, 23 Sep 2024 19:13:53 +0200 Subject: [PATCH 4/7] Merge branch 'master' into release/v2.3.16 # Conflicts: # VERSION_CODE # ios/wallet/Info.plist # package.json --- VERSION_CODE | 2 +- ios/wallet/Info.plist | 4 ++-- package.json | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/VERSION_CODE b/VERSION_CODE index 55596b29f..7fba2b437 100644 --- a/VERSION_CODE +++ b/VERSION_CODE @@ -1 +1 @@ -210 \ No newline at end of file +209 diff --git a/ios/wallet/Info.plist b/ios/wallet/Info.plist index 6b0f7c7d6..4e7713343 100644 --- a/ios/wallet/Info.plist +++ b/ios/wallet/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 2.3.16 + 2.3.15 CFBundleSignature ???? CFBundleURLTypes @@ -41,7 +41,7 @@ CFBundleVersion - 210 + 209 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/package.json b/package.json index a8bd755cb..f671711ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "wallet", +<<<<<<< HEAD "version": "2.3.16", +======= + "version": "2.3.15", +>>>>>>> master "scripts": { "start": "expo start --dev-client", "android": "expo run:android", From 5366eb23c08f515359fa20d1ef4acdb74bcb5406 Mon Sep 17 00:00:00 2001 From: vzhovnitsky Date: Mon, 23 Sep 2024 19:14:43 +0200 Subject: [PATCH 5/7] Merge branch 'master' into release/v2.3.16 # Conflicts: # VERSION_CODE # package.json --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index f671711ab..918055f28 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,6 @@ { "name": "wallet", -<<<<<<< HEAD - "version": "2.3.16", -======= "version": "2.3.15", ->>>>>>> master "scripts": { "start": "expo start --dev-client", "android": "expo run:android", From e5aed00c6fe39a8a5874259b90a4de705cc62d6e Mon Sep 17 00:00:00 2001 From: vzhovnitsky Date: Mon, 23 Sep 2024 19:15:10 +0200 Subject: [PATCH 6/7] Merge branch 'master' into release/v2.3.16 # Conflicts: # VERSION_CODE --- VERSION_CODE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION_CODE b/VERSION_CODE index 7fba2b437..274ccca8a 100644 --- a/VERSION_CODE +++ b/VERSION_CODE @@ -1 +1 @@ -209 +209 \ No newline at end of file From 44bcdfbd1583feb5b5067e47568e4adb9cc9d203 Mon Sep 17 00:00:00 2001 From: vzhovnitsky Date: Mon, 23 Sep 2024 19:16:16 +0200 Subject: [PATCH 7/7] Merge branch 'master' into release/v2.3.16 # Conflicts: # VERSION_CODE # ios/wallet/Info.plist # package.json --- VERSION_CODE | 2 +- ios/wallet/Info.plist | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION_CODE b/VERSION_CODE index 274ccca8a..55596b29f 100644 --- a/VERSION_CODE +++ b/VERSION_CODE @@ -1 +1 @@ -209 \ No newline at end of file +210 \ No newline at end of file diff --git a/ios/wallet/Info.plist b/ios/wallet/Info.plist index 4e7713343..6b0f7c7d6 100644 --- a/ios/wallet/Info.plist +++ b/ios/wallet/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 2.3.15 + 2.3.16 CFBundleSignature ???? CFBundleURLTypes @@ -41,7 +41,7 @@ CFBundleVersion - 209 + 210 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/package.json b/package.json index 918055f28..a8bd755cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wallet", - "version": "2.3.15", + "version": "2.3.16", "scripts": { "start": "expo start --dev-client", "android": "expo run:android",