FIX: Catalyst fixes

Kavorix · Jul 31, 2024 · 20e1bc2 · 20e1bc2
1 parent 896e376
commit 20e1bc2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/components/SelectFeeModal.tsx b/components/SelectFeeModal.tsx
@@ -217,7 +217,7 @@ const SelectFeeModal = forwardRef<BottomModalHandle, SelectFeeModalProps>(
             <Text style={[styles.feeModalLabel, stylesHook.feeModalLabel]}>{loc.send.insert_custom_fee}</Text>
             <View style={styles.optionsContent} />
             <TextInput
-              style={[styles.feeModalLabel, stylesHook.feeModalLabel]}
+              style={[styles.feeModalLabel, stylesHook.feeModalLabel, styles.customFeeTextInput]}
               keyboardType="numeric"
               placeholder={loc.send.create_fee}
               value={customFee}
@@ -277,6 +277,15 @@ const styles = StyleSheet.create({
     fontSize: 22,
     fontWeight: '600',
   },
+  customFeeTextInput: {
+    backgroundColor: '#FFFFFF',
+    borderColor: '#9aa0aa',
+    borderWidth: 1,
+    borderRadius: 4,
+    padding: 8,
+    marginVertical: 8,
+    fontSize: 16,
+  },
   feeModalTime: {
     borderRadius: 5,
     paddingHorizontal: 6,

diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj
@@ -131,7 +131,7 @@
 		B4D0B2682C1DED67006B6B1B /* ReceiveMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D0B2672C1DED67006B6B1B /* ReceiveMethod.swift */; };
 		B4EE583C226703320003363C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B40D4E35225841ED00428FCC /* Assets.xcassets */; };
 		B4EFF73B2C3F6C5E0095D655 /* MockData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4EFF73A2C3F6C5E0095D655 /* MockData.swift */; };
-		C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
+		C978A716948AB7DEC5B6F677 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -383,7 +383,7 @@
 			files = (
 				782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */,
 				764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */,
-				C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */,
+				C978A716948AB7DEC5B6F677 /* (null) in Frameworks */,
 				773E382FE62E836172AAB98B /* libPods-BlueWallet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1395,13 +1395,13 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.bluewallet.bluewallet";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore io.bluewallet.bluewallet catalyst";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "BlueWallet-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,6";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -1450,12 +1450,12 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.bluewallet.bluewallet";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore io.bluewallet.bluewallet catalyst";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "BlueWallet-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,6";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

diff --git a/ios/ci_scripts/ci_post_clone.sh b/ios/ci_scripts/ci_post_clone.sh
@@ -6,19 +6,19 @@ brew install cocoapods
 echo "CocoaPods installation complete."
 
 echo "===== Installing Node.js ====="
-brew install node@18
+brew install node@20
 echo "Node.js installation complete."
 
-# Configure environment to use node@18
-echo "Configuring environment to use node@18..."
-echo 'export PATH="/usr/local/opt/node@18/bin:$PATH"' >> ~/.zshrc
-export PATH="/usr/local/opt/node@18/bin:$PATH"
+# Configure environment to use node@20
+echo "Configuring environment to use node@20..."
+echo 'export PATH="/usr/local/opt/node@20/bin:$PATH"' >> ~/.zshrc
+export PATH="/usr/local/opt/node@20/bin:$PATH"
 
-echo 'export LDFLAGS="-L/usr/local/opt/node@18/lib"' >> ~/.zshrc
-export LDFLAGS="-L/usr/local/opt/node@18/lib"
+echo 'export LDFLAGS="-L/usr/local/opt/node@20/lib"' >> ~/.zshrc
+export LDFLAGS="-L/usr/local/opt/node@20/lib"
 
-echo 'export CPPFLAGS="-I/usr/local/opt/node@18/include"' >> ~/.zshrc
-export CPPFLAGS="-I/usr/local/opt/node@18/include"
+echo 'export CPPFLAGS="-I/usr/local/opt/node@20/include"' >> ~/.zshrc
+export CPPFLAGS="-I/usr/local/opt/node@20/include"
 echo "Configuration complete."
 
 # Install dependencies using yarn

diff --git a/navigation/DetailViewScreensStack.tsx b/navigation/DetailViewScreensStack.tsx
@@ -230,11 +230,7 @@ const DetailViewStackScreensStack = () => {
       />
 
       <DetailViewStack.Screen name="AddWalletRoot" component={AddWalletStack} options={NavigationFormModalOptions} />
-      <DetailViewStack.Screen
-        name="SendDetailsRoot"
-        component={SendDetailsStack}
-        options={navigationStyle({ headerShown: false, presentation: isDesktop ? 'fullScreenModal' : 'modal' })(theme)}
-      />
+      <DetailViewStack.Screen name="SendDetailsRoot" component={SendDetailsStack} options={NavigationDefaultOptions} />
       <DetailViewStack.Screen name="LNDCreateInvoiceRoot" component={LNDCreateInvoiceRoot} options={NavigationDefaultOptions} />
       <DetailViewStack.Screen name="ScanLndInvoiceRoot" component={ScanLndInvoiceRoot} options={NavigationDefaultOptions} />
       <DetailViewStack.Screen name="AztecoRedeemRoot" component={AztecoRedeemStackRoot} options={NavigationDefaultOptions} />