MetaMask · estebanmino · Oct 4, 2019 · Aug 29, 2019 · Aug 30, 2019 · Aug 30, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,25 +1,16 @@
 aliases:
-  - &restore-cache
-    keys:
-      - v1.0.5-{{ .Branch }}-{{ checksum "package.json" }}
-      - v1.0.5-{{ .Branch }}
-
-  - &save-cache
-    key: v1.0.5-{{ .Branch }}-{{ checksum "package.json" }}
-    paths:
-      - node_modules
   - &restore-node-cache
     keys:
-      - v1.0.5-node-{{ .Branch }}-{{ checksum "package.json" }}
-      - v1.0.5-node-{{ .Branch }}
+      - v1.1.0-node-{{ .Branch }}-{{ checksum "package.json" }}
+      - v1.1.0-node-{{ .Branch }}
   - &save-node-cache
-    key: v1.0.5-node-{{ .Branch }}-{{ checksum "package.json" }}
+    key: v1.1.0-node-{{ .Branch }}-{{ checksum "package.json" }}
     paths:
       - node_modules
 
   - &install-node-dependencies
       |
-        rm -rf node_modules/websocket/.git && npm install
+        rm -rf node_modules/websocket/.git && yarn install --network-timeout 300000 --frozen-lockfile --network-concurrency 1
 
 defaults: &defaults
   working_directory: ~/MetaMask
@@ -28,17 +19,15 @@ version: 2
 jobs:
   prep-deps:
     <<: *defaults
-    macos:
-      xcode: 10.2.0
+    docker:
+      - image: circleci/node:10
     steps:
       - checkout
-      - restore_cache: *restore-cache
       - run: *install-node-dependencies
       - persist_to_workspace:
           root: .
           paths:
           - node_modules
-      - save_cache: *save-cache
   prep-node-deps:
     <<: *defaults
     docker:
@@ -61,7 +50,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: npm run lint
+      - run: yarn lint
 
   test-unit:
     <<: *defaults
@@ -72,7 +61,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: npm run test:unit -- -w 3
+      - run: yarn test:unit -- -w 3
     #   - persist_to_workspace:
     #       root: .
     #       paths:
@@ -81,7 +70,7 @@ jobs:
   test-e2e-ios:
     <<: *defaults
     macos:
-      xcode: 10.2.0
+      xcode: 11.1.0
     steps:
       - checkout
       - attach_workspace:
@@ -91,9 +80,10 @@ jobs:
           command:
             |
               brew update
+              brew install watchman
               brew tap wix/brew
               brew install --HEAD applesimutils
-              npm install -g detox-cli
+              yarn global add detox-cli
       - run: echo $IOS_ENV | tr "|" "\n" > .ios.env
       - run: detox clean-framework-cache && detox build-framework-cache
       - run: detox build --configuration ios.sim.release && detox test --configuration ios.sim.release --cleanup
@@ -105,7 +95,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: npm install codecov
+      - run: yarn install codecov
       - run: ./node_modules/bin/codecov
 
   all-tests-pass:
@@ -121,18 +111,17 @@ jobs:
     docker:
       - image: circleci/android:api-28-node8-alpha
     steps:
-      - checkout:
-          path: ~/MetaMask
+      - checkout
       - attach_workspace:
-          at: ~/MetaMask
+          at: .
       - run:
           name: build:accept-android-licenses
           command: (echo y; echo y; echo y; echo y; echo y; echo y) | $ANDROID_HOME/tools/bin/sdkmanager --licenses
       - run:
           name: build:pre-release
           command:
             |
-              npm run build:android:pre-release:bundle
+              yarn build:android:pre-release:bundle
       - store_artifacts:
           path: android/app/build/outputs/bundle/release
           destination: bundle
@@ -144,22 +133,21 @@ jobs:
           destination: sourcemaps-android
       - run:
           name: Announcing pre-release
-          command: npm run build:announce
+          command: yarn build:announce
   publish-pre-release-ios:
     macos:
-      xcode: 10.2.0
+      xcode: 11.1.0
     working_directory:  ~/MetaMask
     environment:
       FL_OUTPUT_DIR: output
     shell: /bin/bash --login -o pipefail
     steps:
-      - checkout:
-          path: ~/MetaMask
+      - checkout
       - attach_workspace:
-          at: ~/MetaMask
+          at: .
       - run:
           name: pre-release
-          command: npm run build:ios:pre-release
+          command: yarn build:ios:pre-release
       - store_artifacts:
           path: sourcemaps/ios
           destination: sourcemaps-ios
@@ -185,14 +173,15 @@ workflows:
       - test-unit:
           requires:
             - prep-node-deps
-    #   - test-e2e-ios:
-    #       requires:
-    #         - test-unit
+      - test-e2e-ios:
+          requires:
+            - prep-node-deps
+            - test-unit
       - all-tests-pass:
           requires:
             - lint
             - test-unit
-            # - test-e2e-ios
+            - test-e2e-ios
     #   - upload-coverage:
     #       requires:
     #         - test-unit

diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "ios/mixpanel-iphone"]
 	path = ios/mixpanel-iphone
 	url = [email protected]:mixpanel/mixpanel-iphone.git
+[submodule "ios/branch-ios-sdk"]
+	path = ios/branch-ios-sdk
+	url = [email protected]:BranchMetrics/ios-branch-deep-linking-attribution.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,75 @@
 
 ## Current Develop Branch
 
+## v0.2.5 - Oct 4 2019
+
+- [#1136](https://github.com/MetaMask/metamask-mobile/pull/1136): Select correct profiles (#1136)
+- [#1135](https://github.com/MetaMask/metamask-mobile/pull/1135): Fix fastlane config (#1135)
+- [#1134](https://github.com/MetaMask/metamask-mobile/pull/1134): renew certs if needed (#1134)
+- [#1132](https://github.com/MetaMask/metamask-mobile/pull/1132): Fix animated fox (#1132)
+- [#1131](https://github.com/MetaMask/metamask-mobile/pull/1131): Bugfix: wizard design qa (#1131)
+- [#1130](https://github.com/MetaMask/metamask-mobile/pull/1130): Bugfix: onboarding design qa (#1130)
+- [#1129](https://github.com/MetaMask/metamask-mobile/pull/1129): Design QA issues (#1129)
+- [#1128](https://github.com/MetaMask/metamask-mobile/pull/1128): Navigation fixes (#1128)
+- [#1127](https://github.com/MetaMask/metamask-mobile/pull/1127): Fix: Add tokens android crash (#1127)
+- [#1125](https://github.com/MetaMask/metamask-mobile/pull/1125): update user agents (#1125)
+- [#1124](https://github.com/MetaMask/metamask-mobile/pull/1124): fix apk generation (#1124)
+- [#1123](https://github.com/MetaMask/metamask-mobile/pull/1123): Support provider.once (#1123)
+- [#1122](https://github.com/MetaMask/metamask-mobile/pull/1122): fix statusbar in dark mode (#1122)
+- [#1121](https://github.com/MetaMask/metamask-mobile/pull/1121): Fix walletconnect sendTransaction (#1121)
+- [#1120](https://github.com/MetaMask/metamask-mobile/pull/1120): fix webview black flash (#1120)
+- [#1119](https://github.com/MetaMask/metamask-mobile/pull/1119): Bump rubyzip from 1.2.3 to 1.3.0 in /ios (#1119)
+- [#1116](https://github.com/MetaMask/metamask-mobile/pull/1116): iOS 13 Support (#1116)
+- [#1115](https://github.com/MetaMask/metamask-mobile/pull/1115): Bump react-native-device-info (#1115)
+- [#1113](https://github.com/MetaMask/metamask-mobile/pull/1113): Fix develop builds (#1113)
+- [#1112](https://github.com/MetaMask/metamask-mobile/pull/1112): bump to v0.2.5 (#1112)
+- [#1096](https://github.com/MetaMask/metamask-mobile/pull/1096): Webview rewrite (#1096)
+- [#1108](https://github.com/MetaMask/metamask-mobile/pull/1108): improvements: instapay (#1108)
+- [#1104](https://github.com/MetaMask/metamask-mobile/pull/1104): Feature: instapay receive (#1104)
+- [#1103](https://github.com/MetaMask/metamask-mobile/pull/1103): Feature: onboarding carousel (#1103)
+- [#1106](https://github.com/MetaMask/metamask-mobile/pull/1106): Update README.md (#1106)
+- [#1101](https://github.com/MetaMask/metamask-mobile/pull/1101): update dapp txn flow in case ropsten faucet is having issues (#1101)
+- [#1075](https://github.com/MetaMask/metamask-mobile/pull/1075): detox: test e2e ios (#1075)
+- [#1097](https://github.com/MetaMask/metamask-mobile/pull/1097): detox: Enable e2e test suite to run on CircleCI (#1097)
+- [#1094](https://github.com/MetaMask/metamask-mobile/pull/1094): update deps and xcode (#1094)
+- [#1093](https://github.com/MetaMask/metamask-mobile/pull/1093): fix Crashlytics import (#1093)
+- [#1092](https://github.com/MetaMask/metamask-mobile/pull/1092): use old xcode to compare build diff (#1092)
+- [#1091](https://github.com/MetaMask/metamask-mobile/pull/1091): fix android apk generation (#1091)
+- [#1090](https://github.com/MetaMask/metamask-mobile/pull/1090): Revert "Update branch to latest version (#1078)" (#1090)
+- [#1089](https://github.com/MetaMask/metamask-mobile/pull/1089): Revert "update submodules (#1079)" (#1089)
+- [#1088](https://github.com/MetaMask/metamask-mobile/pull/1088): Revert "Fix android builds (#1080)" (#1088)
+- [#1087](https://github.com/MetaMask/metamask-mobile/pull/1087): Revert "Fix webview files path (#1081)" (#1087)
+- [#1086](https://github.com/MetaMask/metamask-mobile/pull/1086): Revert "dont use cache on pre-release (#1082)" (#1086)
+- [#1084](https://github.com/MetaMask/metamask-mobile/pull/1084): bugfix: reveal credential ui (#1084)
+- [#1082](https://github.com/MetaMask/metamask-mobile/pull/1082): dont use cache on pre-release (#1082)
+- [#1081](https://github.com/MetaMask/metamask-mobile/pull/1081): Fix webview files path (#1081)
+- [#1080](https://github.com/MetaMask/metamask-mobile/pull/1080): Fix android builds (#1080)
+- [#1079](https://github.com/MetaMask/metamask-mobile/pull/1079): update submodules (#1079)
+- [#1078](https://github.com/MetaMask/metamask-mobile/pull/1078): Update branch to latest version (#1078)
+- [#1076](https://github.com/MetaMask/metamask-mobile/pull/1076): safe check (#1076)
+- [#1058](https://github.com/MetaMask/metamask-mobile/pull/1058): detox: dapp initiated txns (#1058)
+- [#1071](https://github.com/MetaMask/metamask-mobile/pull/1071): bugfix: json rpc accounts api (#1071)
+- [#1069](https://github.com/MetaMask/metamask-mobile/pull/1069): fix ens manager (#1069)
+- [#1068](https://github.com/MetaMask/metamask-mobile/pull/1068): bugfix: android injection (#1068)
+- [#1060](https://github.com/MetaMask/metamask-mobile/pull/1060): Bugfix: custom rpc network (#1060)
+- [#1065](https://github.com/MetaMask/metamask-mobile/pull/1065): bugfix: inpage enable (#1065)
+- [#1054](https://github.com/MetaMask/metamask-mobile/pull/1054): bugfix: remove tokens but ETH (#1054)
+- [#1064](https://github.com/MetaMask/metamask-mobile/pull/1064): Fix circleci builds (#1064)
+- [#1063](https://github.com/MetaMask/metamask-mobile/pull/1063): Revert "Update branch SDK & fix build issues (#1061)" (#1063)
+- [#1062](https://github.com/MetaMask/metamask-mobile/pull/1062): bump circleci cache version (#1062)
+- [#1061](https://github.com/MetaMask/metamask-mobile/pull/1061): Update branch SDK & fix build issues (#1061)
+- [#1056](https://github.com/MetaMask/metamask-mobile/pull/1056): Detox: Import seed phrase and validate via settings (#1056)
+- [#1051](https://github.com/MetaMask/metamask-mobile/pull/1051): updated branch sdk and fix build (#1051)
+- [#1050](https://github.com/MetaMask/metamask-mobile/pull/1050): dont show invalid deeplink if opening the app with no action (#1050)
+- [#1048](https://github.com/MetaMask/metamask-mobile/pull/1048): bugfix: connect modal (#1048)
+- [#1047](https://github.com/MetaMask/metamask-mobile/pull/1047): bugfix: token transfer deeplink (#1047)
+- [#1049](https://github.com/MetaMask/metamask-mobile/pull/1049): Migrate to yarn (#1049)
+- [#1045](https://github.com/MetaMask/metamask-mobile/pull/1045): More UIWebview cleanup (#1045)
+- [#1044](https://github.com/MetaMask/metamask-mobile/pull/1044): remove uiwebview ocurrences (#1044)
+
 ## v0.2.4 - Aug 28 2019
-- [#1038](https://github.com/MetaMask/metamask-mobile/pull/1037) - Fix Approval (#1038)
-- [#1037](https://github.com/MetaMask/metamask-mobile/pull/1037) - Fix walletconnect (#1037)
+- [#1038](https://github.com/MetaMask/metamask-mobile/pull/1038): Fix Approval (#1038)
+: [#1037](https://github.com/MetaMask/metamask-mobile/pull/1037): Fix walletconnect :#1037)
 - [#1036](https://github.com/MetaMask/metamask-mobile/pull/1036): Bugfix: browser crash (#1036)
 - [#1034](https://github.com/MetaMask/metamask-mobile/pull/1034): Bump 0.2.4 (#1034)
 - [#1027](https://github.com/MetaMask/metamask-mobile/pull/1027): Improvement: approval token transfer data (#1027)

diff --git a/README.md b/README.md
@@ -11,45 +11,43 @@ To learn how to develop MetaMask-compatible applications, visit our [Developer D
 ### Building locally
 The code is built using React-Native and running code locally requires a Mac or Linux OS.
 
-- Install [Node.js](https://nodejs.org) **version 8 (latest stable) and npm@6**
+- Install [Node.js](https://nodejs.org) **version 10 (latest stable) and yarn@1 (latest)**
     - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
-    - If you install Node.js manually, ensure you're using npm@6
-        - Install npm@6 using `npm install -g npm@6`
 
 - Before starting, you need to install React Native dependencies:
     - [MacOs](https://facebook.github.io/react-native/docs/getting-started.html#installing-dependencies-1)
     - [Linux](https://facebook.github.io/react-native/docs/getting-started.html#installing-dependencies-2)
  -  Now clone this repo and then install all our dependencies
 
 ```bash
-cd MetaMask
-npm i
+cd metamask-mobile
+yarn install
 ```
 
 - Running the app on Android:
 
 ```bash
-npm run start:android
+yarn start:android
 ```
 
 - Running the app on iOS:
 
 ```bash
-npm run start:ios
+yarn start:ios
 ```
 
 ### Running tests:
  - Unit test:
 ```
-npm run test:unit
+yarn test:unit
 ```
  - E2E Tests (iOS)
 ```
-npm run test:e2e:ios
+yarn test:e2e:ios
 ```
  - E2E Tests (Android)
 ```
-npm run test:e2e:android
+yarn test:e2e:android
 ```
 
 ### Troubleshooting

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -174,8 +174,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 17
-        versionName "0.2.4"
+        versionCode 18
+        versionName "0.2.5"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy "minReactNative", "minReactNative46"
@@ -255,6 +255,8 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-reanimated')
+    implementation project(':react-native-webview')
     implementation project(':react-native-fabric')
     implementation project(':@react-native-community_netinfo')
     implementation project(':react-native-view-shot')
@@ -274,7 +276,6 @@ dependencies {
     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')
     implementation project(':react-native-i18n')

diff --git a/android/app/src/main/java/io/metamask/MainApplication.java b/android/app/src/main/java/io/metamask/MainApplication.java
@@ -1,6 +1,8 @@
 package io.metamask;
 
 import com.facebook.react.ReactApplication;
+import com.swmansion.reanimated.ReanimatedPackage;
+import com.reactnativecommunity.webview.RNCWebViewPackage;
 import com.smixx.fabric.FabricPackage;
 import com.reactnativecommunity.netinfo.NetInfoPackage;
 import fr.greweb.reactnativeviewshot.RNViewShotPackage;
@@ -13,7 +15,6 @@
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import io.branch.rnbranch.RNBranchPackage;
 import io.branch.rnbranch.RNBranchModule;
-import com.web3webview.Web3WebviewPackage;
 import io.metamask.nativeModules.RCTAnalyticsPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import cl.json.RNSharePackage;
@@ -48,6 +49,8 @@ public boolean getUseDeveloperSupport() {
 		protected List<ReactPackage> getPackages() {
 		return Arrays.<ReactPackage>asList(
 				new MainReactPackage(),
+            	new ReanimatedPackage(),
+				new RNCWebViewPackage(),
             	new FabricPackage(),
 				new NetInfoPackage(),
             	new RNViewShotPackage(),
@@ -69,7 +72,6 @@ protected List<ReactPackage> getPackages() {
 				new RNOSModule(),
 				new RNSharePackage(),
 				new VectorIconsPackage(),
-				new Web3WebviewPackage(),
 				new RCTAnalyticsPackage()
 		);
 		}

diff --git a/android/gradlew b/android/gradlew
@@ -106,7 +106,7 @@ fi
 
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+	GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\" \"-Xmx2048m\" \"-Xms256m\" \"-XX:MaxPermSize=2048m\""
 fi
 
 # For Cygwin, switch paths to Windows format before running java

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,4 +1,8 @@
 rootProject.name = 'MetaMask'
+include ':react-native-reanimated'
+project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
+include ':react-native-webview'
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 include ':react-native-fabric'
 project(':react-native-fabric').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fabric/android')
 include ':@react-native-community_netinfo'