Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug/3464 fix login bug #3465

Merged
merged 3 commits into from
Dec 1, 2021
Merged

Bug/3464 fix login bug #3465

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a15d67
Fix switch navigator replacement logic
Cal-L Dec 1, 2021
c0dda4a
Update unit tests
Cal-L Dec 1, 2021
3c1a7ee
Fix unit tests. Commit changes from yarn setup
Cal-L Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions app/components/Nav/App/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/components/UI/ActionModal/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ exports[`ActionModal should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Array [
Object {
Expand Down
1 change: 0 additions & 1 deletion app/components/UI/BlockingActionModal/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ exports[`BlockingActionModal should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"margin": 0,
Expand Down
1 change: 0 additions & 1 deletion app/components/UI/CustomAlert/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ exports[`CustomAlert should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"padding": 20,
Expand Down
1 change: 0 additions & 1 deletion app/components/UI/CustomNonceModal/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ exports[`CustomNonceModal should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"justifyContent": "flex-end",
Expand Down
1 change: 0 additions & 1 deletion app/components/UI/DrawerView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,6 @@ class DrawerView extends PureComponent {
};

logOut = () => {
this.props.navigation.navigate('Login');
this.props.logOut();
};

Expand Down
1 change: 0 additions & 1 deletion app/components/UI/SelectComponent/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ exports[`SelectComponent should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"margin": 0,
Expand Down
6 changes: 0 additions & 6 deletions app/components/Views/BrowserTab/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ exports[`Browser should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"flex": 1,
Expand Down Expand Up @@ -121,7 +120,6 @@ exports[`Browser should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"justifyContent": "flex-start",
Expand Down Expand Up @@ -237,7 +235,6 @@ exports[`Browser should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"justifyContent": "flex-end",
Expand Down Expand Up @@ -296,7 +293,6 @@ exports[`Browser should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"justifyContent": "flex-end",
Expand Down Expand Up @@ -365,7 +361,6 @@ exports[`Browser should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"justifyContent": "flex-end",
Expand Down Expand Up @@ -424,7 +419,6 @@ exports[`Browser should render correctly 1`] = `
scrollOffset={0}
scrollOffsetMax={0}
scrollTo={null}
statusBarTranslucent={false}
style={
Object {
"justifyContent": "flex-end",
Expand Down
1 change: 0 additions & 1 deletion app/components/Views/LockScreen/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ class LockScreen extends PureComponent {
}

logOut = () => {
this.props.navigation.navigate('Login');
this.props.logOut();
};

Expand Down
1 change: 0 additions & 1 deletion app/components/Views/Onboarding/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ class Onboarding extends PureComponent {
}

logOut = () => {
this.props.navigation.navigate('Login');
this.props.logOut();
};

Expand Down
2 changes: 1 addition & 1 deletion app/core/RPCMethods/wallet_addEthereumChain.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe('RPC Method - wallet_addEthereumChain', () => {
try {
await wallet_addEthereumChain({
req: {
params: [{ ...correctParams, chainId: '0x65' }],
params: [{ ...correctParams, chainId: '0x63' }],
},
...otherOptions,
});
Expand Down