Skip to content

Commit

Permalink
Merge pull request #6767 from bithyve/staging
Browse files Browse the repository at this point in the history
build v2.2.5(601)
  • Loading branch information
cakesoft-shashank authored Sep 8, 2023
2 parents a1143a5 + 2e1f845 commit 79eb69e
Show file tree
Hide file tree
Showing 10 changed files with 238 additions and 29 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ android {
applicationId "io.hexawallet.hexa"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 600
versionName "2.2.4"
versionCode 601
versionName "2.2.5"
missingDimensionStrategy 'react-native-camera', 'general'
multiDexEnabled true
resValue "string", "build_config_package", "io.hexawallet.hexa"
Expand Down
24 changes: 12 additions & 12 deletions ios/HEXA.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 600;
CURRENT_PROJECT_VERSION = 601;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
Expand All @@ -1072,7 +1072,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1098,7 +1098,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 600;
CURRENT_PROJECT_VERSION = 601;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
Expand All @@ -1111,7 +1111,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1137,7 +1137,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 600;
CURRENT_PROJECT_VERSION = 601;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
Expand All @@ -1154,7 +1154,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1180,7 +1180,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 600;
CURRENT_PROJECT_VERSION = 601;
DEVELOPMENT_TEAM = Y5TCB759QL;
INFOPLIST_FILE = "HEXA/HEXA.Dev-Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Bitcoin Tribe dev";
Expand All @@ -1191,7 +1191,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1216,7 +1216,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 600;
CURRENT_PROJECT_VERSION = 601;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
Expand All @@ -1229,7 +1229,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1255,7 +1255,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 600;
CURRENT_PROJECT_VERSION = 601;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
INFOPLIST_FILE = "HEXA/HEXA.Stage-Info.plist";
Expand All @@ -1267,7 +1267,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
9 changes: 9 additions & 0 deletions src/assets/images/svgs/bwdetailsIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/common/Colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ const Colors = {
// lightning account
orange: '#FF7761',
mango: '#FABA5F',
bwBackground: '#E9983E',

shadowBlack: '#1F000000',
numberBg: '#F4F4F4',
Expand Down
4 changes: 2 additions & 2 deletions src/common/content/language/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,8 @@
"test6": "Let your imagination run wild, try sending test sats to, and receiving sats, from multiple friends in different permutations and combinations!",
"clickhere": "click here",
"toknowmore": "To know more,",
"checking1": "Store some sats here, but not all. The sats here are your everyday sats - great for spending online or sending to your friends & family",
"checking2": "For safely storing larger amounts of sats, you can use your Savings Account. This will keep your bitcoin safe and sound with better security!",
"checking1": "Checking Account is your default bitcoin wallet. It is a single signature hot wallet",
"checking2": "Store only the amount of funds you would keep in your pocket. Make sure you do the backup using one of the methods provided",
"checking3": "Your Checking Account is a single signature account. Your Savings Account is a 2 of 3 multi-signature account, secured by an authenticator",
"checking4": "Transactions from your Checking Account have lower fees compared to the Savings Account - keep bitcoin here for short-term holding or spending",
"checking5": "Be careful! Someone having your phone's and Bitcoin Tribe wallet’s passcodes, could easily spend or send sats out of your Checking Account. Don't keep sats here you don't expect to use soon",
Expand Down
22 changes: 12 additions & 10 deletions src/components/account-details/AccountDetailsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
import { withNavigation } from 'react-navigation'
import { widthPercentageToDP } from 'react-native-responsive-screen'
import { translations } from '../../common/content/LocContext'
import { hp } from '../../common/data/responsiveness/responsive'
import BWDetailsIcon from '../../assets/images/svgs/bwdetailsIcon.svg'

export type Props = {
accountShell: AccountShell;
Expand Down Expand Up @@ -174,13 +174,15 @@ const AccountDetailsCard: React.FC<Props> = ( {
}}
>
<View style={styles.accountKindBadgeImage}>
{getAvatarForSubAccount(
primarySubAccount,
false,
false,
true,
isBorderWallet
)}
{ accountShell.primarySubAccount.type === AccountType.BORDER_WALLET?
<BWDetailsIcon/>
:getAvatarForSubAccount(
primarySubAccount,
false,
false,
true,
isBorderWallet
)}
</View>
<View
style={{
Expand Down Expand Up @@ -234,7 +236,7 @@ const AccountDetailsCard: React.FC<Props> = ( {
isTestAccount={isTestAccount}
/>
{accountShell.primarySubAccount.type !== AccountType.SWAN_ACCOUNT &&
!isBorderWallet && <KnowMoreButton />}
<KnowMoreButton />}
</View>
)
}
Expand Down Expand Up @@ -311,7 +313,7 @@ const AccountDetailsCard: React.FC<Props> = ( {
...StyleSheet.absoluteFillObject,
backgroundColor:
accountShell.primarySubAccount.type === AccountType.BORDER_WALLET
? Colors.mango
? Colors.bwBackground
: shadowColorForAccountKind( primarySubAccount ),
borderRadius: 15,
}}
Expand Down
191 changes: 191 additions & 0 deletions src/components/know-more-sheets/BorderWalletKnowMore.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
import React, { useState, useRef } from 'react'
import { View, Image, Text, StyleSheet } from 'react-native'
import {
widthPercentageToDP as wp,
heightPercentageToDP as hp,
} from 'react-native-responsive-screen'
import Colors from '../../common/Colors'
import Fonts from '../../common/Fonts'
import { RFValue } from 'react-native-responsive-fontsize'
import { AppBottomSheetTouchableWrapper } from '../AppBottomSheetTouchableWrapper'
import FontAwesome from 'react-native-vector-icons/FontAwesome'
import { ScrollView } from 'react-native-gesture-handler'
import { translations } from '../../common/content/LocContext'
import CrossButton from '../../assets/images/svgs/icons_close.svg'

export default function BorderWalletKnowMore( props ) {
const scrollViewRef = useRef<ScrollView>()
const strings = translations[ 'accounts' ]

return (
<View style={{
...styles.modalContainer, ...props.containerStyle
}}>
<View style={{
height: hp( 81 )
}}>
<View
style={{
flexDirection: 'row', justifyContent: 'center', alignItems: 'center'
}}
>
<Text style={styles.headerText}>Border Wallet</Text>
<AppBottomSheetTouchableWrapper style={{
width: wp( 8 ),
height: wp( 8 ),
borderRadius: wp( 4 ),
backgroundColor: Colors.blue,
justifyContent: 'center',
alignItems: 'center',
marginRight: wp( 2 ),
marginLeft: -wp( 10 )
}}
onPress={() => props.titleClicked && props.titleClicked()}>
<CrossButton />
</AppBottomSheetTouchableWrapper>
</View>
<View style={styles.headerSeparator} />
<ScrollView
ref={scrollViewRef}
style={{
// flex: 1,
backgroundColor: Colors.blue,
}}
snapToInterval={hp( '85%' )}
decelerationRate="fast"
>
<View style={styles.ElementView}>
<Text
style={{
...styles.infoText,
// marginTop: wp( '5%' ),
}}
>
This is a wallet account added to your Tribe app using Border Wallet feature by either adding a new one or by importing an existing grid
</Text>
<View style={{
justifyContent: 'center', alignItems: 'center'
}}>
<Image
source={require( '../../assets/images/icons/checking_account_info_1.png' )}
style={styles.helperImage}
/>
</View>
<Text
style={{
...styles.infoText,
marginBottom: wp( '5%' ),
}}
>
If you restore the app, all the accounts including this one will be reinstated. Alternatively you can back this up separately by going into account settings
</Text>
{/* <AppBottomSheetTouchableWrapper
style={{
alignItems: 'center'
}}
onPress={() => {
scrollViewRef.current &&
scrollViewRef.current.scrollTo( {
x: 0,
y: hp( '75%' ),
animated: true,
} )
}}
>
<FontAwesome
name="angle-double-down"
color={Colors.white}
size={40}
/>
</AppBottomSheetTouchableWrapper> */}
<View style={{
justifyContent: 'center', alignItems: 'center'
}}>
</View>
</View>
</ScrollView>
</View>
</View>
)
}
const styles = StyleSheet.create( {
modalContainer: {
// height: '80%',
backgroundColor: Colors.blue,
alignSelf: 'center',
width: '100%',
elevation: 10,
shadowColor: Colors.borderColor,
shadowOpacity: 10,
shadowOffset: {
width: 0, height: 2
},
},
headerText: {
color: Colors.white,
fontFamily: Fonts.Medium,
fontSize: RFValue( 20 ),
marginTop: hp( '2%' ),
marginBottom: hp( '1%' ),
flex: 1,
textAlign: 'center'
},
headerSeparator: {
backgroundColor: Colors.homepageButtonColor,
height: 1,
marginLeft: wp( '5%' ),
marginRight: wp( '5%' ),
marginBottom: hp( '1%' ),
},
infoText: {
textAlign: 'center',
color: Colors.white,
fontSize: RFValue( 13 ),
fontFamily: Fonts.Regular,
marginLeft: wp( '8%' ),
marginRight: wp( '8%' ),
},
clickHereText: {
color: Colors.white,
fontSize: RFValue( 13 ),
fontFamily: Fonts.Regular,
textDecorationLine: 'underline',
textAlign: 'center',
},
toKnowMoreText: {
color: Colors.white,
fontSize: RFValue( 13 ),
fontFamily: Fonts.Regular,
},
linkView: {
flexDirection: 'row',
marginLeft: wp( '10%' ),
marginRight: wp( '10%' ),
justifyContent: 'center',
flexWrap: 'wrap',
},
ElementView: {
height: hp( '75%' ),
justifyContent: 'space-between',
},
separatorView: {
width: wp( '70%' ),
height: 0,
alignSelf: 'center',
marginBottom: wp( '1%' ),
borderStyle: 'dotted',
borderWidth: 1,
borderRadius: 1,
borderColor: Colors.white,
},
helperImage: {
width: wp( '80%' ),
height: wp( '60%' ),
resizeMode: 'contain',
},
bottomLinkView: {
marginLeft: wp( '10%' ),
marginRight: wp( '10%' ),
marginBottom: wp( '15%' ),
},
} )
Loading

0 comments on commit 79eb69e

Please sign in to comment.