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

Fix/settings design #484

Merged
merged 10 commits into from
Aug 29, 2018
Merged

Fix/settings design #484

merged 10 commits into from
Aug 29, 2018

Conversation

prameetc
Copy link
Contributor

Please check you are not duplicating an existing pull request...

Changes

• Changed button style of Settings Screen
• Changed arrow design of FlatList

Copy link
Contributor

@albertoestarrona albertoestarrona left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@prameetc prameetc self-assigned this Aug 25, 2018
@@ -17,7 +16,7 @@ import type { Navigator } from '../../../../types/ReactNativeNavigation';
import type { Account } from '../../../../types/Account';
import i18n from '../../../../global/i18n';
import ScreenTitle from '../../../../components/common/ScreenTitle';
import Button from '../../../../components/common/Button';
// import Button from '../../../../components/common/Button';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove it or uncomment

@@ -93,13 +92,6 @@ class ProfileScreen extends NavigatorComponent<Props> {
}
}

sharePublicKey = () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you move it from there intentionally? It cause things like that:
screen shot 2018-08-28 at 3 11 01 pm.

This button shouldn't be on edit profile I think. That's why it was on that screen and not on the parent one.

Copy link
Contributor Author

@prameetc prameetc Aug 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seland ok, this was because, if we put the button in the child it takes a bit of padding on both sides. Putting in parent makes the button span the whole width. But you are right, I need to take care of the edit profile part too. Because both are part of the parent component.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about setting the flag editingAccount === null for the button so that it does not render in the EditProfile page?

@seland seland merged commit 46ac781 into develop Aug 29, 2018
@seland seland deleted the fix/settings-design branch August 29, 2018 07:50
@seland seland mentioned this pull request Sep 5, 2018
5 tasks
marknuzz pushed a commit that referenced this pull request Nov 14, 2018
marknuzz pushed a commit that referenced this pull request Nov 14, 2018
Fix/settings design

Former-commit-id: 9581954 [formerly 46ac781]
Former-commit-id: 798b88c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants