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.

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

Login consistency #53

Merged
merged 19 commits into from Mar 24, 2019

Conversation

Projects
None yet
2 participants
@yhaspel
Copy link
Collaborator

yhaspel commented Mar 21, 2019

Initial development for the login consistency includes:
X button on relevant Auth flow pages - will take user to Local Node Page in Main.
Completing a flow will take user to Wallet.
Unlocking a wallet takes user to wallet.

admin and others added some commits Mar 12, 2019

admin admin
Merge branch 'develop' of https://github.com/spacemeshos/smapp into f…
…ull-node-ui

# Conflicts:
#	app/App.js
#	app/components/auth/CenterCard.js
#	app/redux/auth/actions.js
#	app/redux/configureStore.dev.js
#	app/routes.js
#	app/screens/auth/Auth.js
#	app/screens/main/Main.js
#	app/types/redux.js
Merge branch 'develop' of https://github.com/spacemeshos/smapp into f…
…ull-node-ui

# Conflicts:
#	app/App.js
#	app/components/auth/CenterCard.js
#	app/redux/auth/actions.js
#	app/redux/configureStore.dev.js
#	app/routes.js
#	app/screens/auth/Auth.js
#	app/screens/main/Main.js
#	app/types/redux.js
Merge branch 'develop' of https://github.com/spacemeshos/smapp into f…
…ull-node-ui

# Conflicts:
#	app/App.js
#	app/components/auth/CenterCard.js
#	app/redux/auth/actions.js
#	app/redux/configureStore.dev.js
#	app/routes.js
#	app/screens/auth/Auth.js
#	app/screens/main/Main.js
#	app/types/redux.js
admin admin
admin admin

@yhaspel yhaspel requested a review from IlyaVi Mar 21, 2019

Show resolved Hide resolved app/basicComponents/SmInput.js Outdated
Show resolved Hide resolved app/basicComponents/SmInput.js Outdated
Show resolved Hide resolved app/screens/main/Main.js Outdated
@IlyaVi
Copy link
Collaborator

IlyaVi left a comment

see comments

admin and others added some commits Mar 21, 2019

@IlyaVi

IlyaVi approved these changes Mar 24, 2019

@IlyaVi IlyaVi merged commit 314a0c2 into develop Mar 24, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@IlyaVi IlyaVi deleted the login-consistency branch Mar 24, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.