Merge pull request #708 from rsksmart/fix_v0.64

android/app/src/main/java/com/rsk/rwallet/v2/MainApplication.java

@@ -7,6 +7,7 @@
 
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.swmansion.reanimated.ReanimatedPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'rwallet'
+include ':react-native-reanimated'
+project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 

ios/Podfile

@@ -20,4 +20,6 @@ target 'rwallet' do
   #post_install do |installer|
   #  react_native_post_install(installer)
   #end
+  pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
+
 end

package.json

@@ -6,6 +6,7 @@
     "postinstall": "./node_modules/.bin/rn-nodeify --hack --install stream,http,https,crypto,os,url && ./node_modules/.bin/patch-package",
     "install:windows": "npm i && copy .\\postinstall\\blacklist.js .\\node_modules\\metro-config\\src\\defaults\\blacklist.js",
     "start": "react-native start",
+    "start-clean": "react-native start --reset-cache",
     "test": "jest",
     "lint": "eslint .",
     "podinstall": "cd ios && rm -rf Pods Podfile.lock && pod install && cd ..",
@@ -88,6 +89,8 @@
     "react-native-pose": "^0.9.1",
     "react-native-qrcode-svg": "^6.1.1",
     "react-native-randombytes": "^3.6.1",
+    "react-native-reanimated": "^2.2.0",
+    "react-native-safe-area-context": "^3.2.0",
     "react-native-screens": "^1.0.0-alpha.23",
     "react-native-shapes": "^0.1.0",
     "react-native-share": "^6.2.1",
@@ -104,7 +107,9 @@
     "react-native-view-shot": "^3.1.2",
     "react-native-webview": "^11.6.4",
     "react-native-windows": "^0.64.11",
-    "react-navigation": "^3.11.0",
+    "react-navigation": "^4.4.0",
+    "react-navigation-stack": "^2.10.4",
+    "react-navigation-tabs": "^2.11.1",
     "react-redux": "^7.1.0",
     "react-router-redux": "^4.0.8",
     "readable-stream": "^1.0.33",

src/common/storage.js

@@ -1,5 +1,5 @@
 import Storage from 'react-native-storage';
-import AsyncStorage from '@react-native-community/async-storage';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 import RNSecureStorage, { ACCESSIBLE } from 'rn-secure-storage';
 import _ from 'lodash';
 

src/navigation/stack.dapp.js

@@ -1,4 +1,5 @@
-import { createAppContainer, createStackNavigator } from 'react-navigation';
+import { createAppContainer } from 'react-navigation';
+import { createStackNavigator } from 'react-navigation-stack';
 
 import { defaultNavigationOptions, routeConfigMaps } from '../common/navigation.config';
 

src/navigation/stack.exchange.js

@@ -1,4 +1,5 @@
-import { createAppContainer, createStackNavigator } from 'react-navigation';
+import { createAppContainer } from 'react-navigation';
+import { createStackNavigator } from 'react-navigation-stack';
 
 import { defaultNavigationOptions, routeConfigMaps } from '../common/navigation.config';
 

src/navigation/stack.home.js

@@ -1,4 +1,5 @@
-import { createAppContainer, createStackNavigator } from 'react-navigation';
+import { createAppContainer } from 'react-navigation';
+import { createStackNavigator } from 'react-navigation-stack';
 
 import { defaultNavigationOptions, routeConfigMaps } from '../common/navigation.config';
 

src/navigation/stack.mine.js

@@ -1,4 +1,5 @@
-import { createAppContainer, createStackNavigator } from 'react-navigation';
+import { createAppContainer } from 'react-navigation';
+import { createStackNavigator } from 'react-navigation-stack';
 
 import { defaultNavigationOptions, routeConfigMaps } from '../common/navigation.config';
 

src/navigation/stack.spend.js

@@ -1,4 +1,5 @@
-import { createAppContainer, createStackNavigator } from 'react-navigation';
+import { createAppContainer } from 'react-navigation';
+import { createStackNavigator } from 'react-navigation-stack';
 
 import { defaultNavigationOptions, routeConfigMaps } from '../common/navigation.config';
 

src/navigation/tab.primary.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, Image, StyleSheet } from 'react-native';
-import { createBottomTabNavigator } from 'react-navigation';
+import { createBottomTabNavigator } from 'react-navigation-tabs';
 import HomeStackNavigator from './stack.home';
 import MineStackNavigator from './stack.mine';
 import DAppStackNavigator from './stack.dapp';
@@ -12,7 +12,6 @@ import MineLight from '../assets/images/root/tab/mine.l.png';
 import spendLight from '../assets/images/root/tab/spend.l.png';
 import dappLight from '../assets/images/root/tab/dapp.l.png';
 
-
 const styles = StyleSheet.create({
   tabBarView: {
     position: 'absolute',