Skip to content

Commit

Permalink
Merge pull request #7125 from bithyve/staging
Browse files Browse the repository at this point in the history 
RGB fixes and improvements
  • Loading branch information
@cakesoft-shashank
cakesoft-shashank authored Feb 29, 2024
2 parents d7eddcb + b7b8c3a commit 8093ac1
Show file tree
Hide file tree
Showing 54 changed files with 2,205 additions and 1,436 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ android {
applicationId "io.hexawallet.hexa"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 629
versionName "2.4.0"
versionCode 632
versionName "2.4.1"
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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 629;
CURRENT_PROJECT_VERSION = 632;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
Expand All @@ -1172,7 +1172,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.4.0;
MARKETING_VERSION = 2.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1200,7 +1200,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 629;
CURRENT_PROJECT_VERSION = 632;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
Expand All @@ -1216,7 +1216,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.4.0;
MARKETING_VERSION = 2.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1243,7 +1243,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 629;
CURRENT_PROJECT_VERSION = 632;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1477,7 +1477,7 @@
/usr/lib/swift,
"\"${PODS_CONFIGURATION_BUILD_DIR}/expo-secure-store\"/**",
);
MARKETING_VERSION = 2.4.0;
MARKETING_VERSION = 2.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1504,7 +1504,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 629;
CURRENT_PROJECT_VERSION = 632;
DEVELOPMENT_TEAM = Y5TCB759QL;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1638,7 +1638,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.4.0;
MARKETING_VERSION = 2.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1664,7 +1664,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 629;
CURRENT_PROJECT_VERSION = 632;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
Expand All @@ -1680,7 +1680,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.4.0;
MARKETING_VERSION = 2.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1707,7 +1707,7 @@
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 629;
CURRENT_PROJECT_VERSION = 632;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Y5TCB759QL;
INFOPLIST_FILE = "HEXA/HEXA.Stage-Info.plist";
Expand All @@ -1722,7 +1722,7 @@
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 2.4.0;
MARKETING_VERSION = 2.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
12 changes: 11 additions & 1 deletion ios/HEXA/HEXA.Dev-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,22 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>hexa</string>
<string>id</string>
<key>CFBundleURLSchemes</key>
<array>
<string>io.hexawallet.hexa.development</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>hexa</string>
<key>CFBundleURLSchemes</key>
<array>
<string>hexadev</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
Expand Down
12 changes: 11 additions & 1 deletion ios/HEXA/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,22 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>hexa</string>
<string>id</string>
<key>CFBundleURLSchemes</key>
<array>
<string>io.hexawallet.hexa2</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>hexa</string>
<key>CFBundleURLSchemes</key>
<array>
<string>hexa</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
Expand Down
14 changes: 14 additions & 0 deletions src/assets/images/backgroundElements.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions src/assets/images/gear1.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/images/gear2.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/svgs/icon_receive.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/images/svgs/icon_sent.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/bitcoin/HexaConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class HexaConfig {
public BUNDLE_ID_DEV: string = 'io.hexawallet.hexa.development';
public APPSTORE_PROD_ID: string = '1586334138';
public PLAYSTORE_LINK: string = 'https://play.google.com/store/apps/details?id=io.hexawallet.hexa2&hl=en';

public APPSTORE_LINK: string = 'https://apps.apple.com/in/app/bitcoin-tribe/id1586334138';
public SECURE_WALLET_XPUB_PATH: string = Config.BIT_SECURE_WALLET_XPUB_PATH ? Config.BIT_SECURE_WALLET_XPUB_PATH.trim() : '2147483651/2147483649/';
public SECURE_DERIVATION_BRANCH: string = Config.BIT_SECURE_DERIVATION_BRANCH ? Config.BIT_SECURE_DERIVATION_BRANCH.trim() : '1';
public SSS_OTP_LENGTH: string = Config.BIT_SSS_OTP_LENGTH ? Config.BIT_SSS_OTP_LENGTH.trim() : '6';
Expand Down
7 changes: 4 additions & 3 deletions src/common/CommonFunctions/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export const generateDeepLink = async( { deepLinkKind, encryptionType, encryptio
`https://bitcointribe.app/${appType}/${deepLinkKind}/${walletName}/${encryptedChannelKeys}/${encryptionType}-${encryptionHint}/${extraData.channelAddress}/${extraData.amount}/${extraData.note}/${extraData.themeId}/v${appVersion}`
} else {
deepLink =
`https://bitcointribe.app/${appType}/${deepLinkKind}/${walletName}/${encryptedChannelKeys}/${encryptionType}-${encryptionHint}/v${appVersion}${currentLevel != undefined ? '/'+ currentLevel: ''}`
`https://bitcointribe.app/${appType}/${deepLinkKind}/${walletName}/${encryptedChannelKeys}/${encryptionType}-${encryptionHint}/${extraData.channelAddress}/v${appVersion}${currentLevel != undefined ? '/'+ currentLevel: ''}`
}
let shortLink = ''
let id = DeviceInfo.getBundleId();
Expand All @@ -461,11 +461,11 @@ export const generateDeepLink = async( { deepLinkKind, encryptionType, encryptio
domainUriPrefix: domain,
android: {
packageName: id,
fallbackUrl: url,
fallbackUrl: HexaConfig.PLAYSTORE_LINK,
},
ios: {
bundleId: id,
fallbackUrl: url,
bundleId: id
},
navigation: {
forcedRedirectEnabled: false
Expand Down Expand Up @@ -541,6 +541,7 @@ export const processDeepLink = ( deepLink: string ) => {
isExistingContact: [ DeepLinkKind.RECIPROCAL_KEEPER, DeepLinkKind.EXISTING_CONTACT ].includes( ( splits[ 4 ] as DeepLinkKind ) ),
isQR: false,
deepLinkKind: splits[ 4 ],
channelAddress: splits[ 8 ],
version,
}
return {
Expand Down
Loading

0 comments on commit 8093ac1

Please sign in to comment.