Merge pull request #6871 from KeeperCommunity/release/575

Release 578 & ui fixes

Author: cakesoft-vaibhav

android/app/build.gradle

@@ -98,7 +98,7 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 574
+        versionCode 580
         versionName "2.5.6"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'

ios/Podfile.lock

@@ -1834,7 +1834,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (3.36.0):
+  - RNScreens (4.9.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2373,7 +2373,7 @@ SPEC CHECKSUMS:
   RNLocalize: 19917c3f32cf6386f7d2957a638a4281669cae57
   RNQrGenerator: 95feb09b4b2ed65f3a4afe795a20beed4b134ab5
   RNReanimated: 6e7f7b3e9bf83adb6cf60e713e2d1d9438cb5437
-  RNScreens: 3c7a1921b619b7b8d6f59f34a2b53cbf72dd5668
+  RNScreens: 96fe858d87d26c3f46f0696f9e8824ce33a05aa7
   RNSentry: cccb4a5cbe42c46f119b102475abe5dc74712833
   RNShare: d1da96f570164d84821ee9d75740eee7ec2efa87
   RNSVG: 2e59e14c2723a1967cd1bba71038a59142cbc616

ios/hexa_keeper.xcodeproj/project.pbxproj

@@ -748,8 +748,8 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 574;
-				DEVELOPMENT_TEAM = Y5TCB759QL;
+				CURRENT_PROJECT_VERSION = 580;
+				DEVELOPMENT_TEAM = C43HMJTU6P;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -873,10 +873,10 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Distribution: Bithyve UK Ltd (Y5TCB759QL)";
-				CURRENT_PROJECT_VERSION = 574;
-				DEVELOPMENT_TEAM = Y5TCB759QL;
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 580;
+				DEVELOPMENT_TEAM = C43HMJTU6P;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/Headers/Public\"",
@@ -983,9 +983,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.hexawallet.keeper;
 				PRODUCT_NAME = hexa_keeper;
-				PROVISIONING_PROFILE = "cd711cf7-1c75-4302-ad18-39de9d4f8bef";
-				PROVISIONING_PROFILE_SPECIFIER = "Keeper Development";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keeper Distribution";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "whirlpool/hexa_keeper-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1145,7 +1144,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 574;
+				CURRENT_PROJECT_VERSION = 580;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
@@ -1257,7 +1256,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.hexawallet.hexakeeper.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keeper Development";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keeper Dev Dist";
 				SWIFT_OBJC_BRIDGING_HEADER = "whirlpool/hexa_keeper-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "hexa_keeper-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1276,7 +1275,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 574;
+				CURRENT_PROJECT_VERSION = 580;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
@@ -1388,7 +1387,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "cd711cf7-1c75-4302-ad18-39de9d4f8bef";
 				PROVISIONING_PROFILE_SPECIFIER = "Keeper Development";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keeper Development";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keeper Dev Dist";
 				SWIFT_OBJC_BRIDGING_HEADER = "whirlpool/hexa_keeper-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "hexa_keeper-Swift.h";
 				SWIFT_VERSION = 5.0;

ios/hexa_keeper/Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>574</string>
+	<string>580</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>itms-apps</string>

ios/hexa_keeperTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>574</string>
+	<string>580</string>
 </dict>
 </plist>

ios/hexa_keeper_dev-Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>574</string>
+	<string>580</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>itms-apps</string>

package.json

@@ -104,7 +104,7 @@
     "react-native-responsive-screen": "1.4.2",
     "react-native-rsa-native": "2.0.5",
     "react-native-safe-area-context": "4.10.5",
-    "react-native-screens": "3.36.0",
+    "react-native-screens": "4.9.0",
     "react-native-send-intent": "1.3.0",
     "react-native-shadow-2": "6.0.3",
     "react-native-share": "9.2.3",
@@ -193,4 +193,4 @@
   "engines": {
     "node": ">=18"
   }
-}
+}

src/components/MenuFooter.tsx

@@ -11,16 +11,13 @@ import Text from './KeeperText';
 import { LocalizationContext } from 'src/context/Localization/LocContext';
 import ThemedSvg from './ThemedSvg.tsx/ThemedSvg';
 import ThemedColor from './ThemedColor/ThemedColor';
-import BtcLogoGrey from 'src/assets/images/Btc-Logo-grey.svg';
-import { useIsRampAvailable } from 'src/hooks/useIsRampAvailable';
 
 const MenuFooter = ({ selectedOption, onOptionChange }) => {
   const { colorMode } = useColorMode();
   const isDarkMode = colorMode === 'dark';
   const { translations } = useContext(LocalizationContext);
-  const { wallet: walletTranslation, buyBTC: buyBTCTranslation } = translations;
+  const { wallet: walletTranslation } = translations;
   const selectedFooterColor = ThemedColor({ name: 'footer_selected_option' });
-  const { isRampAvailable } = useIsRampAvailable();
 
   const menuOptions = [
     {
@@ -33,11 +30,6 @@ const MenuFooter = ({ selectedOption, onOptionChange }) => {
       defaultIcon: <KeyIcon />,
       selectedIcon: <ThemedSvg name={'footer_Key'} />,
     },
-    isRampAvailable && {
-      name: buyBTCTranslation.acquire,
-      defaultIcon: <BtcLogoGrey width={wp(26)} height={hp(26)} />,
-      selectedIcon: <ThemedSvg name={'footer_buy_btc'} width={wp(26)} height={hp(26)} />,
-    },
     {
       name: walletTranslation.concierge,
       defaultIcon: <ConciergeIcon />,

src/components/Modal/ConciergeOnboardingModal.tsx

@@ -11,6 +11,7 @@ import QueryIllustrationDark from 'src/assets/images/concierge-query-illustratio
 import { setDontShowConceirgeOnboarding } from 'src/store/reducers/storage';
 import Text from '../KeeperText';
 import { CommonActions, useNavigation } from '@react-navigation/native';
+import Colors from 'src/theme/Colors';
 
 function ConciergeOnboardingModal({ visible }) {
   const dispatch = useDispatch();
@@ -38,8 +39,8 @@ function ConciergeOnboardingModal({ visible }) {
       subTitleWidth={wp(310)}
       buttonText={common.confirm}
       buttonCallback={handleContinue}
-      buttonBackground={`${colorMode}.modalWhiteButton`}
-      buttonTextColor={`${colorMode}.textGreen`}
+      buttonBackground={Colors.headerWhite}
+      buttonTextColor={Colors.primaryGreen}
       modalBackground={`${colorMode}.pantoneGreen`}
       textColor={`${colorMode}.headerWhite`}
       Content={() => (