Skip to content

Commit

Permalink
release 5.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
matterhorn063 committed Oct 28, 2022
2 parents ec4a34f + 1c2458a commit ac9e611
Show file tree
Hide file tree
Showing 86 changed files with 4,482 additions and 2,612 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -324,7 +324,7 @@ workflows:
filters:
branches:
only:
- inc-next3
- est-fee-create-tx
- generate_data:
requires:
- checkout_code
Expand Down
1 change: 1 addition & 0 deletions .prettierrc.js
Expand Up @@ -6,4 +6,5 @@ module.exports = {
arrowParens: 'always',
semi: true,
tabWidth: 2,
// printWidth: 100, will update after
};
6 changes: 4 additions & 2 deletions android/app/build.gradle
Expand Up @@ -139,8 +139,8 @@ android {
applicationId "com.incognito.wallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 105
versionName "5.7.0"
versionCode 108
versionName "5.10.0"
missingDimensionStrategy 'react-native-camera', 'general'
}
signingConfigs {
Expand Down Expand Up @@ -260,6 +260,8 @@ dependencies {
// For animated GIF support
implementation 'com.facebook.fresco:fresco:1.12.0'
implementation 'com.facebook.fresco:animated-gif:1.12.0'

implementation project(':react-native-wifi-reborn')
if (enableHermes) {
def hermesPath = "../../node_modules/hermes-engine/android/";
debugImplementation files(hermesPath + "hermes-debug.aar")
Expand Down
15 changes: 15 additions & 0 deletions android/app/src/main/java/com/incognito/wallet/GomobileModule.java
Expand Up @@ -317,4 +317,19 @@ public void run() {
}
});
}

@ReactMethod
public void createOTAReceiverWithCfg(String data, Callback successCallback) {
executorService.execute(new Runnable() {
public void run() {
try {
Log.d(TAG, "createOTAReceiverWithCfg: begin");
successCallback.invoke(null, Gomobile.createOTAReceiverWithCfg(data));
} catch (Exception e) {
Log.d(TAG, "createOTAReceiverWithCfg: error");
successCallback.invoke(e.getMessage(), null);
}
}
});
}
}
Binary file modified android/gomobile/gomobile.aar
Binary file not shown.
2 changes: 2 additions & 0 deletions android/settings.gradle
Expand Up @@ -17,6 +17,8 @@ include ':@react-native-community_async-storage'
project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
include ':react-native-gesture-handler'
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
include ':react-native-wifi-reborn'
project(':react-native-wifi-reborn').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-wifi-reborn/android')
apply from: '../node_modules/react-native-unimodules/gradle.groovy'; includeUnimodulesProjects()
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)

Expand Down
Binary file modified ios/Gomobile.framework/Versions/A/Gomobile
Binary file not shown.
2 changes: 2 additions & 0 deletions ios/Gomobile.framework/Versions/A/Headers/Gomobile.objc.h
Expand Up @@ -33,6 +33,8 @@ FOUNDATION_EXPORT NSString* _Nonnull GomobileCreateConvertTx(NSString* _Nullable

FOUNDATION_EXPORT NSString* _Nonnull GomobileCreateOTAReceiver(NSString* _Nullable paramStr, NSError* _Nullable* _Nullable error);

FOUNDATION_EXPORT NSString* _Nonnull GomobileCreateOTAReceiverWithCfg(NSString* _Nullable args, NSError* _Nullable* _Nullable error);

FOUNDATION_EXPORT NSString* _Nonnull GomobileCreateTransaction(NSString* _Nullable args, int64_t num, NSError* _Nullable* _Nullable error);

FOUNDATION_EXPORT NSString* _Nonnull GomobileDecryptCoin(NSString* _Nullable paramStr, NSError* _Nullable* _Nullable error);
Expand Down
10 changes: 10 additions & 0 deletions ios/Gomobile.m
Expand Up @@ -188,4 +188,14 @@ @implementation GomobileInterface
}
}

RCT_EXPORT_METHOD(createOTAReceiverWithCfg:(NSString *)data callback:(RCTResponseSenderBlock)callback){
@try{
NSString *rs = GomobileCreateOTAReceiverWithCfg(data, nil);
callback(@[[NSNull null], rs]);
}
@catch(NSException *exception){
callback(@[exception.reason, [NSNull null]]);
}
}

@end
32 changes: 16 additions & 16 deletions ios/Incognito.xcodeproj/project.pbxproj
Expand Up @@ -29,13 +29,13 @@
20B559AF22C393B10079FC06 /* Gomobile.m in Sources */ = {isa = PBXBuildFile; fileRef = 20B559AE22C393B10079FC06 /* Gomobile.m */; };
3B50FECFE455494A8373E5A6 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ECBE1563D1B5449E86A7658F /* libRNVectorIcons.a */; };
3EF0EC91E7FE4B16A434459C /* libRNZmqService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE70DDA39F794DA9B6544C35 /* libRNZmqService.a */; };
524C9DB7290BD4A200D913FB /* Gomobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 524C9DB6290BD4A200D913FB /* Gomobile.framework */; };
712C447B244313E700A3CBA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 712C447A244313E700A3CBA6 /* GoogleService-Info.plist */; };
71ACEF372477D8CE003AE3E3 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 71ACEF362477D8CE003AE3E3 /* Images.xcassets */; };
7951D9F679874B4EA8E3CFEE /* libRNFirebase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27AAED89E8AD4248BBC41F79 /* libRNFirebase.a */; };
82E467C899D04A02A0589EB9 /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB08C251E22B438096EA6169 /* libRNGestureHandler.a */; };
9A35DA29B0814E0E85D3F53B /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6024CBE183FA4307ABE2C4F5 /* libRNDeviceInfo.a */; };
A23A5B4BF797429292519AC6 /* libRNCAsyncStorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D828B2179CD4981AB6E75EE /* libRNCAsyncStorage.a */; };
B265A4B428607D760039035C /* Gomobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B265A4B328607D760039035C /* Gomobile.framework */; };
C2E73AA50DDC4747BAD7CC54 /* libRNOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342DA32C89DE489180AC3EF2 /* libRNOS.a */; };
C944FB71546FC63E3C584A22 /* libPods-Incognito.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3C9B022E86A08BD344C7392 /* libPods-Incognito.a */; };
D7BDB11DB76A47B9A686E426 /* libTcpSockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5D037565762439F89BE1412 /* libTcpSockets.a */; };
Expand Down Expand Up @@ -138,6 +138,7 @@
4BA287542ADF445498FC2188 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
50F2B7356C5248EC3BD2EFD3 /* Pods-Incognito.next3.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Incognito.next3.xcconfig"; path = "Target Support Files/Pods-Incognito/Pods-Incognito.next3.xcconfig"; sourceTree = "<group>"; };
51B80536E38043E2810D70AD /* PostGroteskLightItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = PostGroteskLightItalic.otf; path = ../src/assets/fonts/PostGroteskLightItalic.otf; sourceTree = "<group>"; };
524C9DB6290BD4A200D913FB /* Gomobile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Gomobile.framework; sourceTree = "<group>"; };
570EC87F438D402B8F1B76AE /* PostGroteskBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = PostGroteskBold.otf; path = ../src/assets/fonts/PostGroteskBold.otf; sourceTree = "<group>"; };
59AFD324B84E4A7DB397B0B9 /* PostGroteskBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = PostGroteskBoldItalic.otf; path = ../src/assets/fonts/PostGroteskBoldItalic.otf; sourceTree = "<group>"; };
5A53B1ED9DEB4B68B5B3BA7F /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -179,7 +180,6 @@
AF1B701A774B4C75BB5DD399 /* libRNGestureHandler-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNGestureHandler-tvOS.a"; sourceTree = "<group>"; };
B0A5302B2B7A412C881FE22B /* SF-Pro-Display-BlackItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "SF-Pro-Display-BlackItalic.otf"; path = "../src/assets/fonts/SF-Pro-Display-BlackItalic.otf"; sourceTree = "<group>"; };
B21C0D59E5564F04B44CD65D /* libReactNativePermissions.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativePermissions.a; sourceTree = "<group>"; };
B265A4B328607D760039035C /* Gomobile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Gomobile.framework; sourceTree = "<group>"; };
B9A60B371464497786EFB6D1 /* Helvetica-Neue-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Helvetica-Neue-Medium.otf"; path = "../src/assets/fonts/Helvetica-Neue-Medium.otf"; sourceTree = "<group>"; };
C2A67D1A4580441FB14BDBC5 /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; };
C33937D3476A44DEBFDB66AC /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -222,7 +222,7 @@
FE5C9FA82355D46900AC6E90 /* libreact-native-netinfo.a in Frameworks */,
FEEBD6E32355CBB3006EFECD /* libreact-native-camera.a in Frameworks */,
FEEBD6DB2355CA94006EFECD /* libRNPermissions.a in Frameworks */,
B265A4B428607D760039035C /* Gomobile.framework in Frameworks */,
524C9DB7290BD4A200D913FB /* Gomobile.framework in Frameworks */,
FEEBD6D72355CA35006EFECD /* libreact-native-randombytes.a in Frameworks */,
FE86096522D747230050666A /* libFirebaseCore.a in Frameworks */,
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
Expand Down Expand Up @@ -358,7 +358,7 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
B265A4B328607D760039035C /* Gomobile.framework */,
524C9DB6290BD4A200D913FB /* Gomobile.framework */,
1F29808A246D5526000EE1C6 /* fonts */,
FD6F21E024750AA0000CC07D /* BridgeLottie.swift */,
FE52DCEE22DC685E003203EF /* AutonomousZMQ.framework */,
Expand Down Expand Up @@ -760,7 +760,7 @@
CODE_SIGN_ENTITLEMENTS = Incognito/Incognito.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 108;
CURRENT_PROJECT_VERSION = 110;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = G63A8CY3DS;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -795,7 +795,7 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-zmq-service/ios/**",
);
MARKETING_VERSION = 50.23;
MARKETING_VERSION = 50.25;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -823,7 +823,7 @@
CODE_SIGN_ENTITLEMENTS = Incognito/Incognito.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 108;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = G63A8CY3DS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -857,7 +857,7 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-zmq-service/ios/**",
);
MARKETING_VERSION = 50.23;
MARKETING_VERSION = 50.25;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -932,7 +932,7 @@
CODE_SIGN_ENTITLEMENTS = Incognito/Incognito.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 108;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = G63A8CY3DS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -970,7 +970,7 @@
"$(SRCROOT)/../node_modules/react-native-zmq-service/ios/**",
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
);
MARKETING_VERSION = 50.23;
MARKETING_VERSION = 50.25;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1047,7 +1047,7 @@
CODE_SIGN_ENTITLEMENTS = Incognito/Incognito.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 108;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = G63A8CY3DS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -1085,7 +1085,7 @@
"$(SRCROOT)/../node_modules/react-native-zmq-service/ios/**",
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
);
MARKETING_VERSION = 50.23;
MARKETING_VERSION = 50.25;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1162,7 +1162,7 @@
CODE_SIGN_ENTITLEMENTS = Incognito/Incognito.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 108;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = G63A8CY3DS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -1200,7 +1200,7 @@
"$(SRCROOT)/../node_modules/react-native-zmq-service/ios/**",
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
);
MARKETING_VERSION = 50.23;
MARKETING_VERSION = 50.25;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1276,7 +1276,7 @@
CODE_SIGN_ENTITLEMENTS = Incognito/Incognito.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 108;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = G63A8CY3DS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -1314,7 +1314,7 @@
"$(SRCROOT)/../node_modules/react-native-zmq-service/ios/**",
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
);
MARKETING_VERSION = 50.23;
MARKETING_VERSION = 50.25;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
8 changes: 4 additions & 4 deletions ios/Podfile.lock
Expand Up @@ -434,8 +434,8 @@ PODS:
- React
- RNVectorIcons (6.6.0):
- React
- RNWifi (2.4.0):
- React
- RNWifi (4.7.0):
- React-Core
- SDWebImage (5.11.1):
- SDWebImage/Core (= 5.11.1)
- SDWebImage/Core (5.11.1)
Expand Down Expand Up @@ -870,7 +870,7 @@ SPEC CHECKSUMS:
RNShare: d76b8c9c6e6ffb38fc18f40b4338c9d867592ed3
RNSVG: a53a5de0d90ec96a6502cc3a4534dfcc0c130622
RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
RNWifi: 1747f039612dd494192ba6c8bc498606ad9f3ec4
RNWifi: 94c5dd913df64acbd5024f051552ffdd1681642d
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
Expand All @@ -893,4 +893,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 929328304093a46bd8246ff6cdc85ae5412091f2

COCOAPODS: 1.11.2
COCOAPODS: 1.11.3
15 changes: 8 additions & 7 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "incognito-wallet",
"version": "5.7.3",
"version": "5.9.0",
"private": true,
"rnpm": {
"assets": [
Expand Down Expand Up @@ -34,16 +34,16 @@
"ios:clean": "yarn cache clean && rm -rf ~/Library/Developer/Xcode/DerivedData",
"postinstall": "npx patch-package && ./node_modules/.bin/rn-nodeify --install crypto,stream,vm --hack && npx rn-nodeify --install && npx jetify",
"devtools": "react-devtools",
"deployIOS:prod": "appcenter codepush release-react -a Incognito.org/Incognito -t \"50.23\" -d Production -x",
"deployIOS:prod": "appcenter codepush release-react -a Incognito.org/Incognito -t \"50.25\" -d Production -x",
"deployIOS:staging": "appcenter codepush release-react -a Incognito.org/Incognito -t \"50.21\" -d Staging -m",
"deployIOS:next": "appcenter codepush release-react -a Incognito.org/Incognito -t \"50.18\" -d NextRelease -m",
"deployIOS:next2": "appcenter codepush release-react -a Incognito.org/Incognito -t \"50.21\" -d NextRelease2",
"deployIOS:next3": "appcenter codepush release-react -a Incognito.org/Incognito -t \"50.17\" -d NextRelease3",
"deployIOS:next3": "appcenter codepush release-react -a Incognito.org/Incognito -t \"50.24\" -d NextRelease3",
"deployAndroid:staging": "appcenter codepush release-react -a Incognito.org/Incognito-Android -t \"5.5.0\" -d Staging -m",
"deployAndroid:prod": "appcenter codepush release-react -a Incognito.org/Incognito-Android -t \"5.7.0\" -d Production -x",
"deployAndroid:prod": "appcenter codepush release-react -a Incognito.org/Incognito-Android -t \"5.10.0\" -d Production -x",
"deployAndroid:next": "appcenter codepush release-react -a Incognito.org/Incognito-Android -t \"5.3.0\" -d NextRelease -m",
"deployAndroid:next2": "appcenter codepush release-react -a Incognito.org/Incognito-Android -t \"50.21\" -d NextRelease2",
"deployAndroid:next3": "appcenter codepush release-react -a Incognito.org/Incognito-Android -t \"5.2.0\" -d NextRelease3",
"deployAndroid:next3": "appcenter codepush release-react -a Incognito.org/Incognito-Android -t \"5.9.0\" -d NextRelease3",
"deploy:dev": "yarn deployIOS:dev && yarn deployAndroid:dev",
"deploy:staging": "yarn deployIOS:staging && yarn deployAndroid:staging",
"deploy:prod": "yarn deployIOS:prod && yarn deployAndroid:prod",
Expand Down Expand Up @@ -87,7 +87,7 @@
"fuse.js": "^6.6.2",
"https-browserify": "0.0.1",
"immutability-helper": "^3.0.1",
"incognito-chain-web-js": "https://github.com/incognitochain/incognito-chain-web-js#4.4.5.1",
"incognito-chain-web-js": "https://github.com/incognitochain/incognito-chain-web-js#4.4.5.19",
"intl": "^1.2.5",
"jetifier": "^1.6.5",
"json-2-csv": "^3.10.2",
Expand Down Expand Up @@ -176,7 +176,7 @@
"react-native-unimodules": "^0.13.3",
"react-native-vector-icons": "^6.5.0",
"react-native-webview": "^9.0.1",
"react-native-wifi-reborn": "^2.2.1",
"react-native-wifi-reborn": "^4.7.0",
"react-native-youtube-iframe": "^2.2.2",
"react-native-zmq-service": "https://github.com/incognitochain/RNZmqService",
"react-navigation": "^4.0.10",
Expand All @@ -190,6 +190,7 @@
"reduce-reducers": "^1.0.4",
"redux": "^4.0.1",
"redux-form": "8.2.4",
"redux-logger": "3.0.6",
"redux-mock-store": "^1.5.3",
"redux-persist": "^6.0.0",
"redux-thunk": "^2.3.0",
Expand Down
14 changes: 14 additions & 0 deletions react-native+0.61.3.patch
@@ -0,0 +1,14 @@
diff --git a/node_modules/react-native/Libraries/Core/setUpDeveloperTools.js b/node_modules/react-native/Libraries/Core/setUpDeveloperTools.js
index 7a9ff42..40ce9eb 100644
--- a/node_modules/react-native/Libraries/Core/setUpDeveloperTools.js
+++ b/node_modules/react-native/Libraries/Core/setUpDeveloperTools.js
@@ -54,7 +54,7 @@ if (__DEV__) {
JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
}

- if (!Platform.isTesting) {
+ if (!Platform.isTesting && global.nativeLoggingHook) {
const HMRClient = require('../Utilities/HMRClient');
[
'trace',

Binary file added src/assets/images/new-icons/spooky2@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/new-icons/spooky2@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/new-icons/spooky_icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion src/components/EstimateFee/EstimateFee.input.js
Expand Up @@ -11,7 +11,10 @@ import { BtnFast } from '@src/components/Button';
import { COLORS } from '@src/styles';
import PropTypes from 'prop-types';
import { CONSTANT_COMMONS } from '@src/constants';
import { selectedPrivacySelector, childSelectedPrivacySelector } from '@src/redux/selectors';
import {
selectedPrivacySelector,
childSelectedPrivacySelector,
} from '@src/redux/selectors';
import { Text } from '@components/core';
import { styled } from './EstimateFee.styled';
import withEstimateFee from './EstimateFee.enhance';
Expand Down
21 changes: 21 additions & 0 deletions src/components/Icons/icon.spooky.js
@@ -0,0 +1,21 @@
import React from 'react';
import { StyleSheet, ImageProps } from 'react-native';
import { Image } from '@src/components/core';
import { COLORS } from '@src/styles';
import spoonkyIcon from '@src/assets/images/new-icons/spooky_icon.png';

const styled = StyleSheet.create({
icon: {
width: 20,
height: 20,
},
});

const SpoonkyIcon = (props: ImageProps) => {
const { style, ...rest } = props;
return <Image source={spoonkyIcon} style={[styled.icon, style]} {...rest} />;
};

SpoonkyIcon.propTypes = {};

export default SpoonkyIcon;

0 comments on commit ac9e611

Please sign in to comment.