diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
index 8d669386de5..ea450ce7213 100644
--- a/app/components/Nav/App/index.js
+++ b/app/components/Nav/App/index.js
@@ -265,14 +265,17 @@ const App = ({ userLoggedIn }) => {
 				}}
 			>
 				<Stack.Navigator route={route} initialRouteName={route}>
-					<Stack.Screen name="Login" component={Login} options={{ headerShown: false }} />
-					<Stack.Screen
-						name="OnboardingRootNav"
-						component={OnboardingRootNav}
-						options={{ headerShown: false }}
-					/>
-					{userLoggedIn && (
+					{userLoggedIn ? (
 						<Stack.Screen name="HomeNav" component={HomeNav} options={{ headerShown: false }} />
+					) : (
+						<>
+							<Stack.Screen name="Login" component={Login} options={{ headerShown: false }} />
+							<Stack.Screen
+								name="OnboardingRootNav"
+								component={OnboardingRootNav}
+								options={{ headerShown: false }}
+							/>
+						</>
 					)}
 				</Stack.Navigator>
 			</NavigationContainer>
diff --git a/app/components/UI/DrawerView/index.js b/app/components/UI/DrawerView/index.js
index c4dca96a7b6..6b589b498dd 100644
--- a/app/components/UI/DrawerView/index.js
+++ b/app/components/UI/DrawerView/index.js
@@ -565,7 +565,6 @@ class DrawerView extends PureComponent {
 	};
 
 	logOut = () => {
-		this.props.navigation.navigate('Login');
 		this.props.logOut();
 	};
 
diff --git a/app/components/Views/LockScreen/index.js b/app/components/Views/LockScreen/index.js
index c4b157b8606..f8155117738 100644
--- a/app/components/Views/LockScreen/index.js
+++ b/app/components/Views/LockScreen/index.js
@@ -96,7 +96,6 @@ class LockScreen extends PureComponent {
 	}
 
 	logOut = () => {
-		this.props.navigation.navigate('Login');
 		this.props.logOut();
 	};
 
diff --git a/app/components/Views/Onboarding/index.js b/app/components/Views/Onboarding/index.js
index d884acaa0dc..41c1eb17ed2 100644
--- a/app/components/Views/Onboarding/index.js
+++ b/app/components/Views/Onboarding/index.js
@@ -247,7 +247,6 @@ class Onboarding extends PureComponent {
 	}
 
 	logOut = () => {
-		this.props.navigation.navigate('Login');
 		this.props.logOut();
 	};
 
diff --git a/app/core/RPCMethods/wallet_addEthereumChain.test.js b/app/core/RPCMethods/wallet_addEthereumChain.test.js
index a669ff7b0ac..98ce8848a3f 100644
--- a/app/core/RPCMethods/wallet_addEthereumChain.test.js
+++ b/app/core/RPCMethods/wallet_addEthereumChain.test.js
@@ -117,7 +117,7 @@ describe('RPC Method - wallet_addEthereumChain', () => {
 		try {
 			await wallet_addEthereumChain({
 				req: {
-					params: [{ ...correctParams, chainId: '0x65' }],
+					params: [{ ...correctParams, chainId: '0x63' }],
 				},
 				...otherOptions,
 			});
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 98e58002f69..d3b173e2be9 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,6 +1,8 @@
 PODS:
   - boost-for-react-native (1.63.0)
   - Branch (1.39.2)
+  - BVLinearGradient (2.5.6):
+    - React
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.4)
@@ -375,8 +377,8 @@ PODS:
     - React
   - RNCClipboard (1.8.4):
     - React-Core
-  - RNCMaskedView (0.1.11):
-    - React
+  - RNCMaskedView (0.2.6):
+    - React-Core
   - RNCPicker (1.8.1):
     - React-Core
   - RNDefaultPreference (1.4.3):
@@ -420,6 +422,7 @@ PODS:
     - Yoga (~> 1.14)
 
 DEPENDENCIES:
+  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
@@ -488,7 +491,7 @@ DEPENDENCIES:
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - "RNCCheckbox (from `../node_modules/@react-native-community/checkbox`)"
   - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
-  - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
+  - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - "RNCPicker (from `../node_modules/@react-native-community/picker`)"
   - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
@@ -526,6 +529,8 @@ SPEC REPOS:
     - YogaKit
 
 EXTERNAL SOURCES:
+  BVLinearGradient:
+    :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -621,7 +626,7 @@ EXTERNAL SOURCES:
   RNCClipboard:
     :path: "../node_modules/@react-native-clipboard/clipboard"
   RNCMaskedView:
-    :path: "../node_modules/@react-native-community/masked-view"
+    :path: "../node_modules/@react-native-masked-view/masked-view"
   RNCPicker:
     :path: "../node_modules/@react-native-community/picker"
   RNDefaultPreference:
@@ -660,8 +665,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   Branch: 6a281514287f99d707615ac62c2cca69e0213df0
+  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
   FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
   Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893
@@ -672,7 +678,7 @@ SPEC CHECKSUMS:
   Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
   FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  glog: 5337263514dd6f09803962437687240c5dc39aa4
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31
   lottie-react-native: 7ca15c46249b61e3f9ffcf114cb4123e907a2156
@@ -718,7 +724,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
   RNCCheckbox: 357578d3b42652c78ee9a1bb9bcfc3195af6e161
   RNCClipboard: ddd4d291537f1667209c9c405aaa4307297e252e
-  RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
+  RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
   RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4
   RNDefaultPreference: 2f8d6d54230edbd78708ada8d63bb275e5a8415b
   RNDeviceInfo: 8d3a29207835f972bce883723882980143270d55