Merge pull request #142 from rainbow-me/develop

v1.1.4 (1) Production release

.babelrc

@@ -24,6 +24,7 @@
     ]
   ],
   "presets": [
+    "module:react-native-dotenv",
     "module:metro-react-native-babel-preset",
   ],
 }

.eslintrc

@@ -22,7 +22,6 @@
     "class-methods-use-this": "off",
     "no-console": "off",
     "max-len": ["error", {"code": 160, "comments": 500}],
-    #"max-len": ["off", {"code": 160, "comments": 500}],
     "no-tabs": "error",
     "indent": ["error", 2],
     "no-use-before-define": ["error", {"functions": false, "variables": false}],

CHANGELOG.md

@@ -12,6 +12,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Removed
 
+## [1.1.4-1](https://github.com/rainbow-me/rainbow/releases/tag/v1.1.4-1)
+### Added
+* Support for importing private key and seed key
+* Collectibles grouped by families
+* Uniswap liquidity tokens
+
+### Changed
+* WalletConnect support for RPC methods
+
+## [1.1.0-3](https://github.com/rainbow-me/rainbow/releases/tag/v1.1.0-3)
+### Added
+* New data provider
+
+### Removed
+* Removed rainbow-common dependency
+
 ## [1.0.0-11](https://github.com/rainbow-me/rainbow/releases/tag/v1.0.0-11)
 ### Added
 * Analytics

README.md

@@ -9,7 +9,6 @@ A mobile wallet for open finance and the decentralized web.
 * Install CocoaPods by running `sudo gem install cocoapods`
 * Install Watchman `brew install watchman`
 * Install the latest version of XCode: https://developer.apple.com/xcode/
-* Clone and install Rainbow Common, our shared library: https://github.com/rainbow-me/rainbow-common
 
 ## How to run the project
 

android/app/build.gradle

@@ -153,6 +153,7 @@ android {
 }
 
 dependencies {
+    implementation project(':@react-native-community_masked-view')
     implementation project(':@segment_analytics-react-native')
     implementation project(':react-native-firebase')
     implementation project(':@staltz_react-native-tcp')

android/app/src/main/java/com/rainbow/MainApplication.java

@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import org.reactnative.maskedview.RNCMaskedViewPackage;
 import com.segment.analytics.reactnative.core.RNAnalyticsPackage;
 import io.invertase.firebase.RNFirebasePackage;
 import react-native-tcp.TcpSocketsModule;
@@ -58,6 +59,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new RNCMaskedViewPackage(),
             new RNAnalyticsPackage(),
             new RNFirebasePackage(),
             new TcpSocketsModule(),

android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath("com.android.tools.build:gradle:3.4.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

android/gradlew

@@ -1,13 +1,28 @@
 #!/usr/bin/env bash
 
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

android/gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -9,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'Rainbow'
+include ':@react-native-community_masked-view'
+project(':@react-native-community_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/masked-view/android')
 include ':@segment_analytics-react-native'
 project(':@segment_analytics-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/@segment/analytics-react-native/android')
 include ':react-native-firebase'

config/test/jest-setup.js

@@ -0,0 +1,7 @@
+jest.autoMockOff();
+jest.mock('react-native-keychain', () => ({
+  setGenericPassword: jest.fn(),
+  getGenericPassword: jest.fn(),
+  resetGenericPassword: jest.fn()
+}));
+

index.js

@@ -4,7 +4,7 @@ import './shim';
 /* eslint-disable import/first */
 import RNLanguages from 'react-native-languages';
 import lang from 'i18n-js';
-import { resources } from '@rainbow-me/rainbow-common';
+import { resources } from './src/languages';
 
 // eslint-disable-next-line
 import App from './src/App';

ios/Podfile

@@ -53,14 +53,18 @@ target 'Rainbow' do
   pod 'react-native-fast-image', :path => '../node_modules/react-native-fast-image'
   pod 'react-native-version-number', :path => '../node_modules/react-native-version-number'
 
+  pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
   pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
   pod 'RNIOS11DeviceCheck', :path => '../node_modules/react-native-ios11-devicecheck/ios'
   pod 'RNLanguages', :path => '../node_modules/react-native-languages'
   pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
   pod 'RNScreens', :path => '../node_modules/react-native-screens'
+  pod 'RNStoreReview', :path => '../node_modules/react-native-store-review/ios'
 
   pod 'FLAnimatedImage'
   pod 'libwebp'
   pod 'RNAnalytics', :path => '../node_modules/@segment/analytics-react-native'
 
+  pod 'RNCMaskedView', :path => '../node_modules/@react-native-community/masked-view'
+
 end

ios/Podfile.lock

@@ -1,6 +1,8 @@
 PODS:
   - Analytics (3.6.10)
   - boost-for-react-native (1.63.0)
+  - BVLinearGradient (2.5.6):
+    - React
   - Crashlytics (3.10.9):
     - Fabric (~> 1.7.13)
   - DoubleConversion (1.1.6)
@@ -68,8 +70,8 @@ PODS:
   - nanopb/decode (0.3.901)
   - nanopb/encode (0.3.901)
   - Protobuf (3.7.0)
-  - React (0.59.8):
-    - React/Core (= 0.59.8)
+  - React (0.59.9):
+    - React/Core (= 0.59.9)
   - react-native-blur (0.8.0):
     - React
   - react-native-camera (2.11.1):
@@ -83,69 +85,71 @@ PODS:
   - react-native-fast-image (6.1.1):
     - React
     - SDWebImage (~> 5.0)
-  - react-native-netinfo (2.0.10):
+  - react-native-netinfo (3.2.1):
     - React
   - react-native-version-number (0.3.6):
     - React
-  - React/Core (0.59.8):
-    - yoga (= 0.59.8.React)
-  - React/CxxBridge (0.59.8):
+  - React/Core (0.59.9):
+    - yoga (= 0.59.9.React)
+  - React/CxxBridge (0.59.9):
     - Folly (= 2018.10.22.00)
     - React/Core
     - React/cxxreact
     - React/jsiexecutor
-  - React/cxxreact (0.59.8):
+  - React/cxxreact (0.59.9):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
     - React/jsinspector
-  - React/DevSupport (0.59.8):
+  - React/DevSupport (0.59.9):
     - React/Core
     - React/RCTWebSocket
-  - React/fishhook (0.59.8)
-  - React/jsi (0.59.8):
+  - React/fishhook (0.59.9)
+  - React/jsi (0.59.9):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-  - React/jsiexecutor (0.59.8):
+  - React/jsiexecutor (0.59.9):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
     - React/cxxreact
     - React/jsi
-  - React/jsinspector (0.59.8)
-  - React/RCTActionSheet (0.59.8):
+  - React/jsinspector (0.59.9)
+  - React/RCTActionSheet (0.59.9):
     - React/Core
-  - React/RCTAnimation (0.59.8):
+  - React/RCTAnimation (0.59.9):
     - React/Core
-  - React/RCTBlob (0.59.8):
+  - React/RCTBlob (0.59.9):
     - React/Core
-  - React/RCTImage (0.59.8):
+  - React/RCTImage (0.59.9):
     - React/Core
     - React/RCTNetwork
-  - React/RCTLinkingIOS (0.59.8):
+  - React/RCTLinkingIOS (0.59.9):
     - React/Core
-  - React/RCTNetwork (0.59.8):
+  - React/RCTNetwork (0.59.9):
     - React/Core
-  - React/RCTPushNotification (0.59.8):
+  - React/RCTPushNotification (0.59.9):
     - React/Core
-  - React/RCTSettings (0.59.8):
+  - React/RCTSettings (0.59.9):
     - React/Core
-  - React/RCTText (0.59.8):
+  - React/RCTText (0.59.9):
     - React/Core
-  - React/RCTVibration (0.59.8):
+  - React/RCTVibration (0.59.9):
     - React/Core
-  - React/RCTWebSocket (0.59.8):
+  - React/RCTWebSocket (0.59.9):
     - React/Core
     - React/fishhook
     - React/RCTBlob
   - RNAnalytics (1.0.1):
     - Analytics
     - React
-  - RNCAsyncStorage (1.4.0):
+  - RNCAsyncStorage (1.5.0):
+    - React
+  - RNCMaskedView (0.1.1):
     - React
-  - RNDeviceInfo (1.8.0):
+  - RNDeviceInfo (2.3.1):
     - React
   - RNIOS11DeviceCheck (0.0.3):
     - React
@@ -155,12 +159,15 @@ PODS:
     - React
   - RNScreens (1.0.0-alpha.23):
     - React
+  - RNStoreReview (0.1.5):
+    - React
   - SDWebImage (5.0.2):
     - SDWebImage/Core (= 5.0.2)
   - SDWebImage/Core (5.0.2)
-  - yoga (0.59.8.React)
+  - yoga (0.59.9.React)
 
 DEPENDENCIES:
+  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - Crashlytics (~> 3.10.7)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - Fabric (~> 1.7.11)
@@ -196,11 +203,13 @@ DEPENDENCIES:
   - React/RCTWebSocket (from `../node_modules/react-native`)
   - "RNAnalytics (from `../node_modules/@segment/analytics-react-native`)"
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
+  - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNIOS11DeviceCheck (from `../node_modules/react-native-ios11-devicecheck/ios`)
   - RNLanguages (from `../node_modules/react-native-languages`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
+  - RNStoreReview (from `../node_modules/react-native-store-review/ios`)
   - yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -222,6 +231,8 @@ SPEC REPOS:
     - SDWebImage
 
 EXTERNAL SOURCES:
+  BVLinearGradient:
+    :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   Folly:
@@ -244,6 +255,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@segment/analytics-react-native"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-community/async-storage"
+  RNCMaskedView:
+    :path: "../node_modules/@react-native-community/masked-view"
   RNDeviceInfo:
     :path: "../node_modules/react-native-device-info"
   RNIOS11DeviceCheck:
@@ -254,12 +267,15 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-reanimated"
   RNScreens:
     :path: "../node_modules/react-native-screens"
+  RNStoreReview:
+    :path: "../node_modules/react-native-store-review/ios"
   yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
   Analytics: 63744ad4afa65c3bcdcdb7a94b62515bde5b3900
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   Crashlytics: 55e24fc23989680285a21cb1146578d9d18e432c
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   Fabric: 25d0963b691fc97be566392243ff0ecef5a68338
@@ -275,22 +291,24 @@ SPEC CHECKSUMS:
   libwebp: b068a3bd7c45f7460f6715be7bed1a18fd5d6b48
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
   Protobuf: 7a877b7f3e5964e3fce995e2eb323dbc6831bb5a
-  React: 76e6aa2b87d05eb6cccb6926d72685c9a07df152
+  React: a86b92f00edbe1873a63e4a212c29b7a7ad5224f
   react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
   react-native-camera: f1fbfc336ba8ca6de5296190341d1b6022c71cff
   react-native-fast-image: fdfc612dba58fd73136cf5efdaeb8cfcad7f63b2
-  react-native-netinfo: 39c221d058dca040a69e46a083e692bbd65d5ab5
+  react-native-netinfo: 0da34082d2cec3100c9b5073bb217e35f1142bdd
   react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f
   RNAnalytics: d110195618296fed3907830911f01cb6e9be53d0
-  RNCAsyncStorage: 0c3ef98facf3fecf455b518d6f52e10fc964c523
-  RNDeviceInfo: 9e6a0aece8e7455515103ce23372b393843a7ee7
+  RNCAsyncStorage: 9436928b444c5f5361960a7eea051a697c244b68
+  RNCMaskedView: b79e193409a90bf6b5170d421684f437ff4e2278
+  RNDeviceInfo: 74ee98a0b3ef57604ea9953f03eca549a9335160
   RNIOS11DeviceCheck: a4a545fdd08230a17a8ce7608e95038ee23a32aa
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
   RNReanimated: 7a52c90473b5e81c13408d40d797b98387eaddde
   RNScreens: f28b48b8345f2f5f39ed6195518291515032a788
+  RNStoreReview: 62d6afd7c37db711a594bbffca6b0ea3a812b7a8
   SDWebImage: 6764b5fa0f73c203728052955dbefa2bf1f33282
-  yoga: 92b2102c3d373d1a790db4ab761d2b0ffc634f64
+  yoga: 03ff42a6f223fb88deeaed60249020d80c3091ee
 
-PODFILE CHECKSUM: 3ccba29e0a83202613947605e5c564508d36035f
+PODFILE CHECKSUM: 9a1477d30332ab86b10fd2ec7e7842ad52b5382e
 
 COCOAPODS: 1.6.1