Skip to content

Commit

Permalink
Merge pull request #5011 from bithyve/dev
Browse files Browse the repository at this point in the history
Build v1.2.14
  • Loading branch information
Parsh authored Aug 22, 2024
2 parents c42c27d + 7d370d1 commit 81fb532
Show file tree
Hide file tree
Showing 44 changed files with 1,046 additions and 399 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ android {
applicationId "io.hexawallet.keeper"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 383
versionName "1.2.12"
versionCode 384
versionName "1.2.14"
missingDimensionStrategy 'react-native-camera', 'general'
missingDimensionStrategy 'store', 'play'
multiDexEnabled true
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

buildscript {
ext {
buildToolsVersion = "33.0.0"
buildToolsVersion = "34.0.0"
minSdkVersion = 26
compileSdkVersion = 33
targetSdkVersion = 33
compileSdkVersion = 34
targetSdkVersion = 34
kotlin_version = '1.8.0'
kotlinVersion = '1.8.0'
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
Expand Down
16 changes: 8 additions & 8 deletions ios/hexa_keeper.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@
CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 383;
CURRENT_PROJECT_VERSION = 384;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -912,7 +912,7 @@
"$(inherited)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.2.12;
MARKETING_VERSION = 1.2.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -936,7 +936,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: Bithyve UK Ltd (Y5TCB759QL)";
CURRENT_PROJECT_VERSION = 383;
CURRENT_PROJECT_VERSION = 384;
DEVELOPMENT_TEAM = Y5TCB759QL;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -1037,7 +1037,7 @@
"$(inherited)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.2.12;
MARKETING_VERSION = 1.2.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1192,7 +1192,7 @@
CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 383;
CURRENT_PROJECT_VERSION = 384;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -1294,7 +1294,7 @@
"$(PROJECT_DIR)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.2.12;
MARKETING_VERSION = 1.2.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1320,7 +1320,7 @@
CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 383;
CURRENT_PROJECT_VERSION = 384;
DEVELOPMENT_TEAM = Y5TCB759QL;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -1422,7 +1422,7 @@
"$(PROJECT_DIR)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.2.12;
MARKETING_VERSION = 1.2.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion ios/hexa_keeper/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>383</string>
<string>384</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NFCReaderUsageDescription</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/hexa_keeperTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>383</string>
<string>384</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/hexa_keeper_dev-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>383</string>
<string>384</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NFCReaderUsageDescription</key>
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hexa_keeper",
"version": "1.2.12",
"version": "1.2.14",
"private": true,
"scripts": {
"ios": "react-native run-ios",
Expand Down Expand Up @@ -84,14 +84,14 @@
"react-native-gifted-charts": "^1.4.7",
"react-native-hce": "0.2.0",
"react-native-html-to-pdf": "0.12.0",
"react-native-iap": "12.10.5",
"react-native-iap": "12.15.2",
"react-native-image-picker": "4.10.3",
"react-native-keychain": "8.1.2",
"react-native-linear-gradient": "^2.8.3",
"react-native-localize": "2.2.2",
"react-native-mmkv": "2.11.0",
"react-native-modal": "13.0.1",
"react-native-nfc-manager": "3.13.5",
"react-native-nfc-manager": "3.14.7",
"react-native-pdf": "6.7.1",
"react-native-qr-decode-image-camera": "1.1.2",
"react-native-qrcode-svg": "6.1.2",
Expand Down
106 changes: 106 additions & 0 deletions src/components/KeyAddedModal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import React, { useContext } from 'react';
import { useNavigation } from '@react-navigation/native';
import { Box, Text, useColorMode } from 'native-base';
import moment from 'moment';
import KeeperModal from 'src/components/KeeperModal';
import { hp, wp } from 'src/constants/responsive';
import { StyleSheet } from 'react-native';
import HexagonIcon from 'src/components/HexagonIcon';
import Colors from 'src/theme/Colors';
import { LocalizationContext } from 'src/context/Localization/LocContext';
import { SDIcons } from 'src/screens/Vault/SigningDeviceIcons';

function ModalCard({ title, subTitle, icon = null }) {
const { colorMode } = useColorMode();
return (
<Box backgroundColor={`${colorMode}.seashellWhite`} style={styles.cardContainer}>
<Box style={styles.iconContainer}>
<HexagonIcon
width={wp(42.5)}
height={hp(38)}
icon={icon}
backgroundColor={colorMode == 'dark' ? Colors.ForestGreenDark : Colors.pantoneGreen}
/>
</Box>
<Box style={styles.textContainer}>
<Text style={styles.titleText} color={`${colorMode}.headerText`}>
{title}
</Text>
<Text style={styles.subTitleText} color={`${colorMode}.GreyText`}>
{subTitle}
</Text>
</Box>
</Box>
);
}

const KeyAddedModal = ({ visible, close, signer }) => {
const navigtaion = useNavigation();
const { colorMode } = useColorMode();
const { translations } = useContext(LocalizationContext);
const { signer: signerTranslations } = translations;

return (
<KeeperModal
visible={visible}
close={close}
title={signerTranslations.signerAddedSuccessMessage}
subTitle={signerTranslations.signerAvailableMessage}
showCloseIcon={false}
modalBackground={`${colorMode}.modalWhiteBackground`}
textColor={`${colorMode}.modalWhiteContent`}
Content={() => (
<Box style={{ gap: 20 }}>
<ModalCard
title={signer?.signerName}
icon={SDIcons(signer?.type, colorMode !== 'dark').Icon}
subTitle={`Added ${moment(signer?.addedOn).calendar()}`}
/>
<Text style={styles.descText}>{signerTranslations.signerAddedDesc}</Text>
</Box>
)}
buttonText={signerTranslations.signerDeatils}
buttonTextColor={`${colorMode}.buttonText`}
buttonBackground={`${colorMode}.greenButtonBackground`}
buttonCallback={() => {
close();
navigtaion.navigate('SigningDeviceDetails', {
signerId: signer?.masterFingerprint,
});
}}
/>
);
};

const styles = StyleSheet.create({
cardContainer: {
alignItems: 'center',
flexDirection: 'row',
borderRadius: 10,
paddingHorizontal: 10,
paddingVertical: 15,
minHeight: hp(70),
marginBottom: hp(35),
marginTop: hp(20),
},
titleText: {
fontSize: 14,
fontWeight: '500',
},
subTitleText: {
fontSize: 12,
fontWeight: '400',
},
iconContainer: {
marginHorizontal: 10,
},
textContainer: {},
descText: {
fontSize: 13,
letterSpacing: 0.13,
fontWeight: '400',
marginBottom: hp(20),
},
});

export default KeyAddedModal;
37 changes: 35 additions & 2 deletions src/components/NotificationStack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,39 @@ const Card = memo(({ uai, index, totalLength, activeIndex, skipUaiHandler }: Car
secondary: skipBtnConfig(uai, true),
},
};
case uaiType.SIGN_TRANSACTION:
return {
heading: uai.uaiDetails.heading,
body: uai.uaiDetails.body,
btnConfig: {
primary: {
text: 'Decline',
cta: async () => {
try {
setmodalActionLoader(true);
if (uai.entityId) {
const res = await InheritanceKeyServer.declineInheritanceKeyRequest(
uai.entityId
);
if (res?.declined) {
showToast('IKS request declined');
uaiSetActionFalse();
setShowModal(false);
} else {
Alert.alert('Something went Wrong!');
}
}
} catch (err) {
Alert.alert('Something went Wrong!');
console.log('Error in declining request');
}
setShowModal(false);
setmodalActionLoader(false);
},
},
secondary: skipBtnConfig(uai, true),
},
};
default:
return null;
}
Expand Down Expand Up @@ -512,7 +545,7 @@ const Card = memo(({ uai, index, totalLength, activeIndex, skipUaiHandler }: Car
visible={insightModal}
close={() => {
setInsightModal(false);
skipUaiHandler(uai, true);
dispatch(uaiActioned({ uaiId: uai.id, action: true }));
}}
showCloseIcon={false}
modalBackground={`${colorMode}.modalWhiteBackground`}
Expand All @@ -522,7 +555,7 @@ const Card = memo(({ uai, index, totalLength, activeIndex, skipUaiHandler }: Car
buttonText={'Done'}
buttonCallback={() => {
setInsightModal(false);
skipUaiHandler(uai, true);
dispatch(uaiActioned({ uaiId: uai.id, action: true }));
}}
Content={() => <FeeInsightsContent />}
/>
Expand Down
19 changes: 15 additions & 4 deletions src/context/Localization/language/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@
"confirmPassCode": "Confirm Passcode",
"backupNow": "Backup Now",
"dontShowAgain": "Don’t show me this message again",
"for": "For"
"for": "For",
"goToBackup": "Go to Backup"
},
"noInternet": {
"no": "No Internet",
Expand Down Expand Up @@ -608,6 +609,7 @@
"vaultHiddenSuccessMessage": "Vault hidden successfully",
"hideVaultModalDesc": "You can unhide this vault anytime from App Settings >Manage Wallets > Unhide",
"vaultSettingsTitle": "Vault Settings",
"collabSettingsTitle": "Collaborative Wallet Settings",
"vaultSettingsSubtitle": "Settings specific to the vault",
"vaultDetailsTitle": "Vault Details",
"vaultDetailsDesc": "Vault name & description",
Expand Down Expand Up @@ -836,7 +838,7 @@
"shareAnalyticsDesc": "No personal or bitcoin data is shared",
"analyticsDescription": "No personal or bitcoin data is shared",
"changePasscode": "Change Passcode",
"changePasscodeDescription": "Easy to remember; hard to guess",
"changePasscodeDescription": "The PIN used when logging in",
"personalCloudBackup": "Personal Cloud Backup",
"deleteKeys": "Show and delete keys",
"deleteKeysSubtitle": "for hidden keys",
Expand All @@ -847,7 +849,12 @@
"SingerSettingsTitle": "Advanced Options",
"SingerSettingsSubtitle": "For all keys",
"ManageWalletsEmptyTitle": "Hide Unhide Wallets",
"ManageWalletsEmptySubtitle": "Avoid clutter on the homescreen and keep wallets away from prying eyes."
"ManageWalletsEmptySubtitle": "Avoid clutter on the homescreen and keep wallets away from prying eyes.",
"RKHealthCheckTitle": "Health Check",
"RKHealthCheckSubtitle": "For the Recovery Phrase",
"RKHealthCheckDesc": "Please Back up your Recovery Key in order to change your current Passcode",
"RKBackupTitle": "Backup Recovery Key",
"RKBackupSubTitle": "Carefully write down the 12-word Recovery Key in a private place and ensure its security"
},
"onboarding": {
"Comprehensive": "Comprehensive",
Expand Down Expand Up @@ -981,7 +988,11 @@
"MKHealthCheckNote": "Please backup the Recovery Key from home screen Settings. Your Mobile Key will be backed-up automatically.",
"MKHealthCheckModalDesc": "Mobile Key is derived from the app’s master key using BIP-85",
"hideSignerTitle": "Hide/Unhide Keys",
"hideSignerSubtitle": "Hiding keys ensures only the ones you frequently use are visible in Manage Keys while the others are readily available here."
"hideSignerSubtitle": "Hiding keys ensures only the ones you frequently use are visible in Manage Keys while the others are readily available here.",
"signerAddedSuccessMessage": "Signer added Successfully!",
"signerAvailableMessage": "The signer key is now available to use for creating vaults",
"signerDeatils": "Signer Details",
"signerAddedDesc": "Perform regular health checks on your signer key"
},
"inheritancePlanning": {
"commingSoon": "COMING SOON",
Expand Down
Loading

0 comments on commit 81fb532

Please sign in to comment.