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

Wallet main screen #41

Merged
merged 3 commits into from Mar 18, 2019

Conversation

Projects
None yet
1 participant
@IlyaVi
Copy link
Collaborator

IlyaVi commented Mar 18, 2019

Some components rewrite
Screen Shot 2019-03-18 at 17 49 11

IlyaVi added some commits Mar 18, 2019

Merge branch 'develop' of https://github.com/spacemeshos/smapp into w…
…allet-main-screen

# Conflicts:
#	app/assets/images/index.js
#	app/screens/index.js
#	app/screens/main/Main.js
#	app/types/redux.js
Merge branch 'develop' of https://github.com/spacemeshos/smapp into w…
…allet-main-screen

# Conflicts:
#	app/assets/images/index.js
#	app/screens/index.js
#	app/screens/main/Main.js
#	app/types/redux.js

@IlyaVi IlyaVi merged commit 29398d2 into develop Mar 18, 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 wallet-main-screen branch Mar 18, 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.