From 3b9a8334d29899ace50749a3233f2b09733b2d13 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 28 Nov 2024 10:16:53 +0200 Subject: [PATCH 1/7] chore: version bump --- android/app/build.gradle | 4 ++-- ios/bitkit.xcodeproj/project.pbxproj | 8 ++++---- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c173ee574..d0ddef9f0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,8 +83,8 @@ android { applicationId "to.bitkit" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 138 - versionName "1.0.6" + versionCode 139 + versionName "1.0.7" multiDexEnabled true missingDimensionStrategy 'react-native-camera', 'general' testBuildType System.getProperty('testBuildType', 'debug') diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj index 3276567d6..3d9932419 100644 --- a/ios/bitkit.xcodeproj/project.pbxproj +++ b/ios/bitkit.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 138; + CURRENT_PROJECT_VERSION = 139; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist; @@ -530,7 +530,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.6; + MARKETING_VERSION = 1.0.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -551,7 +551,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 138; + CURRENT_PROJECT_VERSION = 139; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist; @@ -562,7 +562,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.6; + MARKETING_VERSION = 1.0.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index 30bdedd7b..035243b37 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bitkit", "author": "Synonym", - "version": "1.0.6", + "version": "1.0.7", "scripts": { "start": "react-native start", "android": "react-native run-android", From 326448ff1912d48c811cb55c38f2777b1441893d Mon Sep 17 00:00:00 2001 From: Philipp Walter Date: Thu, 28 Nov 2024 13:38:43 +0100 Subject: [PATCH 2/7] fix(receive): revert CJIT channel size change --- src/screens/Wallets/Receive/ReceiveConnect.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/Wallets/Receive/ReceiveConnect.tsx b/src/screens/Wallets/Receive/ReceiveConnect.tsx index 0bb7b5ac0..3f19375a4 100644 --- a/src/screens/Wallets/Receive/ReceiveConnect.tsx +++ b/src/screens/Wallets/Receive/ReceiveConnect.tsx @@ -41,7 +41,7 @@ const ReceiveConnect = ({ const { maxChannelSizeSat } = blocktank.options; const minChannelSize = Math.round(amount * 2.5); const maxChannelSize = Math.round(maxChannelSizeSat / 2); - const channelSize = Math.min(minChannelSize, maxChannelSize); + const channelSize = Math.max(minChannelSize, maxChannelSize); const lspBalance = channelSize - amount; const payAmount = amount - feeEstimate; const displayFee = useDisplayValues(feeEstimate); From f0cde24a9f71cabb4c6f1887eeb4b070ab19c904 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Nov 2024 08:41:05 +0200 Subject: [PATCH 3/7] chore: build bump --- android/app/build.gradle | 2 +- ios/bitkit.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d0ddef9f0..997c5492f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,7 +83,7 @@ android { applicationId "to.bitkit" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 139 + versionCode 140 versionName "1.0.7" multiDexEnabled true missingDimensionStrategy 'react-native-camera', 'general' diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj index 3d9932419..d930efde1 100644 --- a/ios/bitkit.xcodeproj/project.pbxproj +++ b/ios/bitkit.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 139; + CURRENT_PROJECT_VERSION = 140; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist; @@ -551,7 +551,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 139; + CURRENT_PROJECT_VERSION = 140; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist; From 01f3c74a654b23abc63427189f3706282e602693 Mon Sep 17 00:00:00 2001 From: Philipp Walter Date: Fri, 29 Nov 2024 12:51:08 +0100 Subject: [PATCH 4/7] fix(send): allow scroll on Review screen --- src/screens/Wallets/Send/ReviewAndSend.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/screens/Wallets/Send/ReviewAndSend.tsx b/src/screens/Wallets/Send/ReviewAndSend.tsx index 1a008940c..a9325794c 100644 --- a/src/screens/Wallets/Send/ReviewAndSend.tsx +++ b/src/screens/Wallets/Send/ReviewAndSend.tsx @@ -9,6 +9,7 @@ import React, { } from 'react'; import { StyleSheet, View, TouchableOpacity, Keyboard } from 'react-native'; import { TInvoice } from '@synonymdev/react-native-ldk'; +import { BottomSheetScrollView } from '@gorhom/bottom-sheet'; import { useTranslation } from 'react-i18next'; import { validateTransaction } from 'beignet'; @@ -567,7 +568,7 @@ const ReviewAndSend = ({ <> - + - + Date: Tue, 3 Dec 2024 11:33:51 +0200 Subject: [PATCH 5/7] chore: build bump --- android/app/build.gradle | 2 +- ios/bitkit.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 997c5492f..f61da95cb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,7 +83,7 @@ android { applicationId "to.bitkit" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 140 + versionCode 141 versionName "1.0.7" multiDexEnabled true missingDimensionStrategy 'react-native-camera', 'general' diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj index d930efde1..0a5503f92 100644 --- a/ios/bitkit.xcodeproj/project.pbxproj +++ b/ios/bitkit.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 140; + CURRENT_PROJECT_VERSION = 141; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist; @@ -551,7 +551,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 140; + CURRENT_PROJECT_VERSION = 141; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist; From f714fb3ca344269700919b3fb81a8154dd5fc0c0 Mon Sep 17 00:00:00 2001 From: Philipp Walter Date: Wed, 4 Dec 2024 10:34:29 +0100 Subject: [PATCH 6/7] Revert "fix(send): allow scroll on Review screen" This reverts commit 01f3c74a654b23abc63427189f3706282e602693. --- src/screens/Wallets/Send/ReviewAndSend.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/screens/Wallets/Send/ReviewAndSend.tsx b/src/screens/Wallets/Send/ReviewAndSend.tsx index a9325794c..1a008940c 100644 --- a/src/screens/Wallets/Send/ReviewAndSend.tsx +++ b/src/screens/Wallets/Send/ReviewAndSend.tsx @@ -9,7 +9,6 @@ import React, { } from 'react'; import { StyleSheet, View, TouchableOpacity, Keyboard } from 'react-native'; import { TInvoice } from '@synonymdev/react-native-ldk'; -import { BottomSheetScrollView } from '@gorhom/bottom-sheet'; import { useTranslation } from 'react-i18next'; import { validateTransaction } from 'beignet'; @@ -568,7 +567,7 @@ const ReviewAndSend = ({ <> - + - + Date: Wed, 4 Dec 2024 10:36:16 +0100 Subject: [PATCH 7/7] chore: build bump --- android/app/build.gradle | 2 +- ios/bitkit.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f61da95cb..29a60a51c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,7 +83,7 @@ android { applicationId "to.bitkit" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 141 + versionCode 142 versionName "1.0.7" multiDexEnabled true missingDimensionStrategy 'react-native-camera', 'general' diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj index 0a5503f92..7057349ed 100644 --- a/ios/bitkit.xcodeproj/project.pbxproj +++ b/ios/bitkit.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 141; + CURRENT_PROJECT_VERSION = 142; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist; @@ -551,7 +551,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 141; + CURRENT_PROJECT_VERSION = 142; DEVELOPMENT_TEAM = KYH47R284B; ENABLE_BITCODE = NO; INFOPLIST_FILE = bitkit/Info.plist;