Merge pull request #68 from VerusCoin/dev

0.2.1
VerusCoin · Apr 10, 2021 · 8184196 · 8184196
2 parents a09f1d3 + bbbf1b2
commit 8184196
Show file tree

Hide file tree

Showing 272 changed files with 8,559 additions and 5,107 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,4 +58,42 @@ keystore.properties
 *.jsbundle
 
 # CocoaPods
-/ios/Pods/
+/ios/Pods/
+android/app/src/main/res/drawable-hdpi/node_modules_reactnavigation_stack_src_views_assets_backicon.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnativepaper_src_assets_backchevron.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnativeratings_src_images_airbnbstar.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnativeratings_src_images_airbnbstarselected.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnativeratings_src_images_bell.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnativeratings_src_images_heart.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnativeratings_src_images_rocket.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnativeratings_src_images_star.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnavigation_stack_src_views_assets_backicon.png
+android/app/src/main/res/drawable-mdpi/node_modules_reactnavigation_stack_src_views_assets_backiconmask.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_add.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_aproved.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_bank2.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_bankbuilding.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_bankbuildingblack.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_buy.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_buysell.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_calendar.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_callanswer.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_email.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_file.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_homeiconsilhouette.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_idcard.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_mapsandflags.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_pending.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_piggybank.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_sell.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_user.png
+android/app/src/main/res/drawable-mdpi/src_images_customicons_verus.png
+android/app/src/main/res/drawable-xhdpi/node_modules_reactnavigation_stack_src_views_assets_backicon.png
+android/app/src/main/res/drawable-xxhdpi/node_modules_reactnavigation_stack_src_views_assets_backicon.png
+android/app/src/main/res/drawable-xxxhdpi/node_modules_reactnavigation_stack_src_views_assets_backicon.png
+android/java_pid17246.hprof
+android/java_pid22456.hprof
+android/app/debug.keystore
+android/keystores/debug.keystore
+ios/verusMobile.xcodeproj/project.pbxproj
+ios/verusMobile.xcodeproj/project.pbxproj
diff --git a/App.js b/App.js
@@ -2,17 +2,19 @@ import React from 'react';
 import VerusMobile from './src/VerusMobile'
 import store from './src/store'
 import { Provider } from 'react-redux'
-import { Portal } from 'react-native-paper';
+import { NavigationContainer } from '@react-navigation/native';
+import BigNumber from 'bignumber.js';
 
+BigNumber.set({EXPONENTIAL_AT: 1000000});
 
 export default class App extends React.Component {
   render() {
     return (
-      <Portal.Host>
-        <Provider store={store}>
+      <Provider store={store}>
+        <NavigationContainer>
           <VerusMobile/>
-        </Provider>
-      </Portal.Host>
+        </NavigationContainer>
+      </Provider>
     );
   }
 }
diff --git a/__mocks__/react-native-fetch/fetch.js b/__mocks__/react-native-fetch/fetch.js
@@ -2,8 +2,10 @@ const mocked_results = require('./mocked_results/mocked_results.js')
 const {
   MOCK_PROXY_URL,
   FIAT_EXCHANGE_RATES_URL,
-  VERUS_RATE_URL
+  VERUS_RATE_URL,
+  UNMOCK_FETCH
 } = require("./util/mock_urls");
+const nodeFetch = require('node-fetch');
 
 /**
  * Mock of the react-native-fetch http call function. If the URL is an electrum string,
@@ -13,7 +15,9 @@ const {
  * @param {Object} payload Fetch type, body, headers etc.
  */
 const fetch = async function(url, payload) {
-  if (url.endsWith(MOCK_PROXY_URL)) {
+  if (url.endsWith(UNMOCK_FETCH)) {
+    return nodeFetch(url.split(' ')[0], payload)
+  } else if (url.endsWith(MOCK_PROXY_URL)) {
     return new Promise((resolve) => (resolve({status: 200})))
   } else if (url === FIAT_EXCHANGE_RATES_URL) {
     return new Promise(resolve =>

diff --git a/__mocks__/react-native-fetch/util/mock_urls.js b/__mocks__/react-native-fetch/util/mock_urls.js
@@ -1,9 +1,11 @@
 const FIAT_EXCHANGE_RATES_URL = "https://api.exchangeratesapi.io/latest?base=USD"
 const VERUS_RATE_URL = 'https://api.coinpaprika.com/v1/coins/vrsc-test-coin/ohlcv/latest'
 const MOCK_PROXY_URL = 'mock.proxy.server'
+const UNMOCK_FETCH = ' unmock'
 
 module.exports = {
   FIAT_EXCHANGE_RATES_URL,
   VERUS_RATE_URL,
-  MOCK_PROXY_URL
+  MOCK_PROXY_URL,
+  UNMOCK_FETCH
 }
diff --git a/android/app/bin/src/main/AndroidManifest.xml b/android/app/bin/src/main/AndroidManifest.xml
@@ -10,10 +10,12 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:screenOrientation="portrait"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"
+        android:screenOrientation="portrait"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
         android:windowSoftInputMode="adjustPan">

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -4,8 +4,8 @@ import com.android.build.OutputFile
 
 def versionMajor = 0
 def versionMinor = 2
-def versionRevision = 0
-def versionBuild = 2
+def versionRevision = 1
+def versionBuild = 0
 
 def keystorePropertiesFile = rootProject.file("keystore.properties");
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -10,11 +10,13 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:screenOrientation="portrait"
       android:allowBackup="false"
       android:theme="@style/AppTheme"
       android:testOnly="false">
       <activity
         android:name=".MainActivity"
+        android:screenOrientation="portrait"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
         android:windowSoftInputMode="adjustPan"
@@ -23,6 +25,7 @@
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
       <activity
         android:name=".SplashActivity"
+        android:screenOrientation="portrait"
         android:theme="@style/SplashTheme"
         android:label="@string/app_name">
         <intent-filter>

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -2,8 +2,5 @@ rootProject.name = 'verusmobile'
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
-include ':react-native-verus-light-client'
-project(':react-native-verus-light-client').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-verus-light-client/android')
-include ':greeting'
-project(':greeting').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-verus-light-client/greeting')
+
 include ':app'
diff --git a/env/main.json b/env/main.json
@@ -1,10 +1,10 @@
 {
-  "APP_VERSION": "0.2.0-beta-2",
+  "APP_VERSION": "0.2.1-beta",
   "VERUS_QR_VERSION": "0.2.0",
   "CHAIN_QR_VERSION": "0.1.0",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
-  "REQUEST_TIMEOUT_MS": 10000,
+  "REQUEST_TIMEOUT_MS": 60000,
 
   "BLOCK_HEADER_STORE_CAP": 20,
   "MIN_HEADER_CACHE_CONFS": 100,
@@ -13,8 +13,8 @@
 
   "ENABLE_FIAT_GATEWAY": false,
   "ENABLE_VERUS_IDENTITIES": false,
-  "DISABLED_CHANNELS": ["dlight"],
-  "ENABLE_DLIGHT": false,
+  "DISABLED_CHANNELS": [],
+  "ENABLE_DLIGHT": true,
   "ENABLE_ERC20": true,
   "ENABLE_ETH": true,
   "ENABLE_ELECTRUM": true,
@@ -28,4 +28,4 @@
 
   "ETHERSCAN_API_KEY": "PUT_KEY_HERE",
   "INFURA_PROJECT_ID": "PUT_ID_HERE"
-}
+}
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,4 +1,4 @@
-platform :ios, '12.0'
+platform :ios, '13.0'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 $dynamic_frameworks = [
   'react-native-verus-light-client', 
@@ -40,14 +40,16 @@ $dynamic_frameworks = [
   'SwiftNIOHPACK', 
   'SwiftNIOSSL', 
   'CNIOBoringSSL', 
+  'CNIOWindows',
   'CNIOBoringSSLShims', 
   'SwiftNIOTransportServices', 
   'SwiftNIOFoundationCompat', 
   'CGRPCZlib',
   'BoringSSL-GRPC',
   'nanopb',
   'SwiftProtobuf',
-  'SQLite.swift'
+  'SQLite.swift',
+  'MnemonicSwift'
 ]
 
 pre_install do |installer|
@@ -98,8 +100,9 @@ target 'verusmobile' do
   pod 'RNInputMask', :path => '../node_modules/react-native-text-input-mask/ios/InputMask'
   pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
   pod 'Permission-Camera', :path => "#{permissions_path}/Camera.podspec"
-  pod 'ZcashLightClientKit', :git => 'https://github.com/michaeltout/ZcashLightClientKit.git', :branch => '0.6.3', :testspecs => ['Tests']
+  pod 'ZcashLightClientKit', :git => 'https://github.com/michaeltout/ZcashLightClientKit.git', :branch => '0.9.1', :testspecs => ['Tests']
   pod 'ReactNativeART', :path => '../node_modules/@react-native-community/art'
+  pod 'MnemonicSwift', '~> 2.0.0'
 
   target 'verusmobileTests' do
     inherit! :search_paths