Upgrade react native to v0.58.4 (#393)

* ios app working

* rn navigation & co updated

* fix snapshots

* remove extra files

* add mm faucet

* fix detox android
pull/394/head^2
Bruno Barbieri 4 years ago committed by GitHub
parent 974b4da240
commit 434f7f719d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 70
      .flowconfig
  2. 1
      .watchmanconfig
  3. 22
      android/app/BUCK
  4. 8
      android/app/build.gradle
  5. 19
      android/app/build_defs.bzl
  6. 25
      android/build.gradle
  7. 2
      android/gradle/wrapper/gradle-wrapper.properties
  8. 13
      app/components/TransactionEdit/index.js
  9. 42
      app/components/WebsiteIcon/index.js
  10. 4
      app/util/dapp-url-list.js
  11. 6
      app/util/testSetup.js
  12. 2
      branch.json
  13. 2
      e2e/config.json
  14. 1
      index.js
  15. 124
      ios/MetaMask.xcodeproj/project.pbxproj
  16. 129
      ios/MetaMask.xcodeproj/xcshareddata/xcschemes/metamask-tvOS.xcscheme
  17. 2
      ios/MetaMask/AppDelegate.h
  18. 2
      ios/MetaMask/main.m
  19. 5309
      package-lock.json
  20. 28
      package.json
  21. 2
      scripts/build.sh

@ -0,0 +1,70 @@
[ignore]
; We fork some components by platform
.*/*[.]android.js
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/
; Ignore unexpected extra "@providesModule"
.*/node_modules/.*/node_modules/fbjs/.*
; Ignore duplicate module providers
; For RN Apps installed via npm, "Libraries" folder is inside
; "node_modules/react-native" but in the source repo it is in the root
.*/Libraries/react-native/React.js
; Ignore polyfills
.*/Libraries/polyfills/.*
; Ignore metro
.*/node_modules/metro/.*
[include]
[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow/
node_modules/react-native/flow-github/
[options]
emoji=true
esproposal.optional_chaining=enable
esproposal.nullish_coalescing=enable
module.system=haste
module.system.haste.use_name_reducers=true
# get basename
module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
# strip .js or .js.flow suffix
module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
# strip .ios suffix
module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
module.system.haste.paths.blacklist=.*/__tests__/.*
module.system.haste.paths.blacklist=.*/__mocks__/.*
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
munge_underscores=true
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
module.file_ext=.js
module.file_ext=.jsx
module.file_ext=.json
module.file_ext=.native.js
suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
[version]
^0.86.0

@ -8,23 +8,13 @@
# - `buck install -r android/app` - compile, install and run application
#
load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
lib_deps = []
for jarfile in glob(['libs/*.jar']):
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
lib_deps.append(':' + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)
create_aar_targets(glob(["libs/*.aar"]))
for aarfile in glob(['libs/*.aar']):
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
lib_deps.append(':' + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)
create_jar_targets(glob(["libs/*.jar"]))
android_library(
name = "all-libs",
@ -45,12 +35,12 @@ android_library(
android_build_config(
name = "build_config",
package = "io.metamask",
package = "com.metamask",
)
android_resource(
name = "res",
package = "io.metamask",
package = "com.metamask",
res = "src/main/res",
)

@ -143,6 +143,11 @@ def enableProguardInReleaseBuilds = false
android {
packagingOptions {
pickFirst '**/libjsc.so'
}
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
@ -236,6 +241,8 @@ dependencies {
implementation "com.facebook.react:react-native:+" // From node_modules
implementation project(':react-native-branch')
implementation "io.branch.sdk.android:library:3.0.4"
implementation project(':react-native-web3-webview')
implementation project(':react-native-camera')
implementation project(':react-native-share')
@ -250,7 +257,6 @@ dependencies {
implementation project(':react-native-vector-icons')
implementation project(':react-native-shake')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
transitive = true;
}

@ -0,0 +1,19 @@
"""Helper definitions to glob .aar and .jar targets"""
def create_aar_targets(aarfiles):
for aarfile in aarfiles:
name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
lib_deps.append(":" + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)
def create_jar_targets(jarfiles):
for jarfile in jarfiles:
name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
lib_deps.append(":" + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)

@ -3,18 +3,21 @@
buildscript {
ext {
buildToolsVersion = "28.0.3"
buildToolsVersion = "28.0.2"
minSdkVersion = 19
compileSdkVersion = 28
targetSdkVersion = 28
supportLibVersion = "27.1.1"
supportLibVersion = "28.0.0"
kotlinVersion = '1.3.0'
}
repositories {
google()
jcenter()
}
dependencies {
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@ -34,6 +37,18 @@ allprojects {
url "$rootDir/../node_modules/jsc-android/dist"
}
}
subprojects {
afterEvaluate {
project ->
if (project.hasProperty("android")) {
android {
compileSdkVersion = rootProject.ext.compileSdkVersion
buildToolsVersion = rootProject.ext.buildToolsVersion
}
}
}
}
}
subprojects {project ->
@ -50,7 +65,9 @@ subprojects {project ->
}
}
task wrapper(type: Wrapper) {
gradleVersion = '4.4'
gradleVersion = '4.7'
distributionUrl = distributionUrl.replace("bin", "all")
}

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

@ -277,13 +277,20 @@ class TransactionEdit extends Component {
this.setState({ toAddressError });
};
onScanSuccess = () => {
onScan = () => {
this.props.navigation.navigate('QRScanner', {
onScanSuccess: this.props.onScanSuccess,
onScanSuccess: this.onScanSuccess,
addressOnly: true
});
};
onScanSuccess = meta => {
this.props.onScanSuccess(meta);
if (meta.target_address) {
this.updateToAddress(meta.target_address);
}
};
renderAmountLabel = () => {
const { amountError } = this.state;
const { assetType } = this.props.transaction;
@ -348,7 +355,7 @@ class TransactionEdit extends Component {
onBlur={this.updateToAddress}
onFocus={this.onFocusToAddress}
placeholder={strings('transaction.recipient_address')}
showQRScanner={this.onScanSuccess}
showQRScanner={this.onScan}
value={to}
/>
</View>

@ -66,29 +66,31 @@ export default class WebsiteIcon extends Component {
await this.setState({ renderIconUrlError: true });
};
render = () => {
renderIconWithFallback = error => {
const { viewStyle, style, title, textStyle } = this.props;
const { apiLogoUrl, renderIconUrlError } = this.state;
return (
<View>
{!renderIconUrlError && (
<View style={viewStyle}>
<FadeIn placeholderStyle={{ backgroundColor: colors.white }}>
<Image source={apiLogoUrl} style={style} onError={this.onRenderIconUrlError} />
</FadeIn>
const { apiLogoUrl } = this.state;
if (error && title) {
return (
<View style={viewStyle}>
<View style={[styles.fallback, style]}>
<Text style={[styles.fallbackText, textStyle]}>{title.substring(0, 1).toUpperCase()}</Text>
</View>
)}
{renderIconUrlError &&
title && (
<View style={viewStyle}>
<View style={[styles.fallback, style]}>
<Text style={[styles.fallbackText, textStyle]}>
{title.substring(0, 1).toUpperCase()}
</Text>
</View>
</View>
)}
</View>
);
}
return (
<View style={viewStyle}>
<FadeIn placeholderStyle={{ backgroundColor: colors.white }}>
<Image source={apiLogoUrl} style={style} onError={this.onRenderIconUrlError} />
</FadeIn>
</View>
);
};
render = () => {
const { renderIconUrlError } = this.state;
return <View>{this.renderIconWithFallback(renderIconUrlError)}</View>;
};
}

@ -6814,5 +6814,9 @@ export default [
{
url: 'https://faucet.ropsten.be/',
name: 'Ropsten Ethereum Faucet'
},
{
url: 'https://faucet.metamask.io/',
name: 'Metamask Ether Faucet (Ropsten)'
}
];

@ -99,9 +99,3 @@ NativeModules.RNGestureHandlerModule = {
NativeModules.PlatformConstants = {
forceTouchAvailable: false
};
NativeModules.UIManager = {
RCTView: () => ({
directEventTypes: {}
})
};

@ -1,7 +1,5 @@
{
"debugMode": true,
"liveKey": "key_live_miz18CYAqYay29Ahgs0o2bejutcU3qqL",
"testKey": "key_test_pfrX7t9xE4pyZZydcD6k6eikEubI7xA1",
"useTestInstance": true,
"delayInitToCheckForSearchAds": false,
"appleSearchAdsDebugMode": false

@ -1,6 +1,6 @@
{
"rootDir": "../",
"setupTestFrameworkScriptFile": "./e2e/init.js",
"setupFilesAfterEnv": ["./e2e/init.js"],
"preset": "react-native",
"forceExit": true,
"transform": {

@ -11,6 +11,7 @@ useScreens();
// List of warnings that we're ignoring
YellowBox.ignoreWarnings([
'Accessing view manager configs directly off',
'Function components cannot be given refs.',
'Task orphaned for request',
'Module RNOS requires',

@ -27,6 +27,7 @@
151FBD06212F591A00AE84BB /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 151FBD04212F591900AE84BB /* Fabric.framework */; };
151FBD07212F591A00AE84BB /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 151FBD05212F591900AE84BB /* Crashlytics.framework */; };
15205D6321596BAA0049EA93 /* MetaMask.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 15205D6221596AD90049EA93 /* MetaMask.entitlements */; };
153C1ABB2217BCDC0088EFE0 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 153C1A742217BCDC0088EFE0 /* JavaScriptCore.framework */; };
158B0638211A727500DF3C74 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
158B063B211A72F500DF3C74 /* InpageBridgeWeb3.js in Resources */ = {isa = PBXBuildFile; fileRef = 158B0639211A72F500DF3C74 /* InpageBridgeWeb3.js */; };
158B063C211A72F500DF3C74 /* InpageBridge.js in Resources */ = {isa = PBXBuildFile; fileRef = 158B063A211A72F500DF3C74 /* InpageBridge.js */; };
@ -194,6 +195,34 @@
remoteGlobalIDString = 6478985F1F38BF9100DA1C12;
remoteInfo = "RNKeychain-tvOS";
};
153C1A9D2217BCDC0088EFE0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
remoteInfo = jsi;
};
153C1A9F2217BCDC0088EFE0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
remoteInfo = jsiexecutor;
};
153C1AA12217BCDC0088EFE0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
remoteInfo = "jsi-tvOS";
};
153C1AA32217BCDC0088EFE0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
remoteInfo = "jsiexecutor-tvOS";
};
155FCCEC21E5A04E0014B614 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 42454F52498F498B85D39065 /* RNScreens.xcodeproj */;
@ -369,20 +398,6 @@
remoteGlobalIDString = 3D383D621EBD27B9005632C8;
remoteInfo = "double-conversion-tvOS";
};
2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
remoteInfo = privatedata;
};
2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
remoteInfo = "privatedata-tvOS";
};
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@ -460,20 +475,6 @@
remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
remoteInfo = "cxxreact-tvOS";
};
3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
remoteInfo = jschelpers;
};
3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
remoteInfo = "jschelpers-tvOS";
};
5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
@ -535,6 +536,7 @@
151FBD04212F591900AE84BB /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
151FBD05212F591900AE84BB /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
15205D6221596AD90049EA93 /* MetaMask.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = MetaMask.entitlements; path = MetaMask/MetaMask.entitlements; sourceTree = "<group>"; };
153C1A742217BCDC0088EFE0 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
158B0639211A72F500DF3C74 /* InpageBridgeWeb3.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = InpageBridgeWeb3.js; path = ../app/core/InpageBridgeWeb3.js; sourceTree = "<group>"; };
158B063A211A72F500DF3C74 /* InpageBridge.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = InpageBridge.js; path = ../app/core/InpageBridge.js; sourceTree = "<group>"; };
15D158EC210BD8C8006982B5 /* Metamask.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Metamask.ttf; path = ../app/fonts/Metamask.ttf; sourceTree = "<group>"; };
@ -610,6 +612,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
153C1ABB2217BCDC0088EFE0 /* JavaScriptCore.framework in Frameworks */,
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
158B0638211A727500DF3C74 /* libRCTAnimation.a in Frameworks */,
146834051AC3E58100842450 /* libReact.a in Frameworks */,
@ -753,16 +756,16 @@
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
2DF0FFE32056DD460020B375 /* libthird-party.a */,
2DF0FFE52056DD460020B375 /* libthird-party.a */,
2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
153C1A9E2217BCDC0088EFE0 /* libjsi.a */,
153C1AA02217BCDC0088EFE0 /* libjsiexecutor.a */,
153C1AA22217BCDC0088EFE0 /* libjsi-tvOS.a */,
153C1AA42217BCDC0088EFE0 /* libjsiexecutor-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -940,6 +943,7 @@
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
isa = PBXGroup;
children = (
153C1A742217BCDC0088EFE0 /* JavaScriptCore.framework */,
2D16E6891FA4F8E400B85C8A /* libReact.a */,
);
name = Frameworks;
@ -1378,6 +1382,34 @@
remoteRef = 1539CE81211A810A00EC0138 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
153C1A9E2217BCDC0088EFE0 /* libjsi.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjsi.a;
remoteRef = 153C1A9D2217BCDC0088EFE0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
153C1AA02217BCDC0088EFE0 /* libjsiexecutor.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjsiexecutor.a;
remoteRef = 153C1A9F2217BCDC0088EFE0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
153C1AA22217BCDC0088EFE0 /* libjsi-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjsi-tvOS.a";
remoteRef = 153C1AA12217BCDC0088EFE0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
153C1AA42217BCDC0088EFE0 /* libjsiexecutor-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjsiexecutor-tvOS.a";
remoteRef = 153C1AA32217BCDC0088EFE0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
155FCCED21E5A04E0014B614 /* libRNScreens.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -1553,20 +1585,6 @@
remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libprivatedata.a;
remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libprivatedata-tvOS.a";
remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -1644,20 +1662,6 @@
remoteRef = 3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjschelpers.a;
remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjschelpers.a;
remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D2A28121D9B038B00D4039D"
BuildableName = "libReact.a"
BlueprintName = "React-tvOS"
ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "metamask-tvOS.app"
BlueprintName = "metamask-tvOS"
ReferencedContainer = "container:metamask.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
BuildableName = "metamask-tvOSTests.xctest"
BlueprintName = "metamask-tvOSTests"
ReferencedContainer = "container:metamask.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
BuildableName = "metamask-tvOSTests.xctest"
BlueprintName = "metamask-tvOSTests"
ReferencedContainer = "container:metamask.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "metamask-tvOS.app"
BlueprintName = "metamask-tvOS"
ReferencedContainer = "container:metamask.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "metamask-tvOS.app"
BlueprintName = "metamask-tvOS"
ReferencedContainer = "container:metamask.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "metamask-tvOS.app"
BlueprintName = "metamask-tvOS"
ReferencedContainer = "container:metamask.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

@ -1,5 +1,5 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.

@ -1,5 +1,5 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.

5309
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -64,7 +64,7 @@
"ethjs-unit": "^0.1.6",
"events": "^3.0.0",
"fuse.js": "^3.2.0",
"gaba": "^1.0.0-beta.58",
"gaba": "^1.0.0-beta.59",
"https-browserify": "0.0.1",
"jsc-android": "^236355.1.1",
"multihashes": "^0.4.14",
@ -72,11 +72,11 @@
"prop-types": "^15.6.2",
"pubnub": "^4.21.5",
"react": "^16.6.3",
"react-native": "^0.57.8",
"react-native": "^0.58.4",
"react-native-actionsheet": "^2.4.2",
"react-native-aes-crypto": "github:brunobar79/react-native-aes#495bf43f119f6ee5998e7e42b9cb02bb39a5a524",
"react-native-animated-fox": "github:brunobar79/react-native-animated-fox#master",
"react-native-branch": "^2.3.3",
"react-native-branch": "3.0.0-beta.1",
"react-native-browser-polyfill": "^0.1.2",
"react-native-button": "github:brunobar79/react-native-button#master",
"react-native-camera": "^1.2.0",
@ -86,7 +86,7 @@
"react-native-fabric": "^0.5.2",
"react-native-fade-in-image": "^1.4.1",
"react-native-fs": "^2.10.14",
"react-native-gesture-handler": "^1.0.12",
"react-native-gesture-handler": "^1.0.15",
"react-native-i18n": "^2.0.15",
"react-native-keyboard-aware-scroll-view": "^0.7.2",
"react-native-keychain": "github:brunobar79/react-native-keychain#5210c22c94a4d66c2e0231604601b3636bfc41bc",
@ -105,7 +105,7 @@
"react-native-svg": "^9.0.0",
"react-native-vector-icons": "^6.1.0",
"react-native-web3-webview": "^1.2.8",
"react-navigation": "^3.0.9",
"react-navigation": "^3.2.3",
"react-redux": "^5.0.7",
"readable-stream": "^1.0.33",
"redux": "^4.0.0",
@ -122,18 +122,18 @@
"@babel/core": "^7.1.6",
"assert": "^1.4.1",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.1.0",
"base-x": "3.0.4",
"concat-cli": "^4.0.0",
"detox": "^9.1.2",
"detox": "^10.0.7",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"enzyme-to-json": "^3.3.4",
"eslint": "^5.9.0",
"eslint-config-react-native": "^3.0.0",
"husky": "^1.0.0-rc.13",
"jest": "^23.6.0",
"jest-serializer": "^23.0.1",
"jest": "^24.1.0",
"jest-serializer": "^24.0.0",
"lint-staged": "^7.2.0",
"metro-react-native-babel-preset": "^0.49.2",
"octonode": "^0.9.5",
@ -188,21 +188,21 @@
},
"ios.sim.release": {
"binaryPath": "ios/build/Build/Products/Release-iphonesimulator/MetaMask.app",
"build": "npm run start:ios -- --configuration Release",
"build": "npm run build:ios:release",
"type": "ios.simulator",
"name": "iPhone X"
},
"android.emu.debug": {
"binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk",
"build": "cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..",
"build": "source .android.env && cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..",
"type": "android.emulator",
"name": "Pixel_2_API_27"
"name": "Pixel_2_API_28"
},
"android.emu.release": {
"binaryPath": "android/app/build/outputs/apk/release/app-release.apk",
"build": "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ..",
"build": "source .android.env && cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ..",
"type": "android.emulator",
"name": "Pixel_2_API_27"
"name": "Pixel_2_API_28"
}
},
"runner-config": "e2e/config.json",

@ -143,7 +143,7 @@ buildIosRelease(){
cd ios && bundle install && bundle exec fastlane prerelease
else
cd ios && fastlane beta
react-native run-ios --configuration Release
fi
}

Loading…
Cancel
Save