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

Style updates #2375

Merged
merged 11 commits into from
Apr 15, 2021
Merged

Style updates #2375

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6a6ca93
Fix AssetList typeface
rickycodes Mar 25, 2021
361dc16
Update BaseNotification text
rickycodes Mar 25, 2021
34beba3
Update ChoosePassword ImportFromSeed
rickycodes Mar 25, 2021
e283439
Update styles
rickycodes Mar 25, 2021
5741192
Update snapshots
rickycodes Mar 25, 2021
bac172b
Merge branch 'develop' into style-updates
rickycodes Apr 8, 2021
ca11bf0
Update snapshot
rickycodes Apr 8, 2021
968a74e
Merge branch 'develop' into style-updates
rickycodes Apr 9, 2021
c64d4d2
Merge branch 'develop' into style-updates
rickycodes Apr 15, 2021
0b21476
fix checkmark position
rickycodes Apr 15, 2021
0eb29df
update snapshots
rickycodes Apr 15, 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
6 changes: 3 additions & 3 deletions app/components/UI/AccountInfoCard/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports[`AccountInfoCard should render correctly 1`] = `
numberOfLines={1}
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 16,
"fontWeight": "600",
Expand All @@ -60,7 +60,7 @@ exports[`AccountInfoCard should render correctly 1`] = `
numberOfLines={1}
style={
Object {
"color": "#000000",
"color": "#24292E",
"flexGrow": 1,
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 16,
Expand All @@ -78,7 +78,7 @@ exports[`AccountInfoCard should render correctly 1`] = `
style={
Object {
"alignSelf": "flex-start",
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "100",
Expand Down
3 changes: 2 additions & 1 deletion app/components/UI/AssetList/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React, { PureComponent } from 'react';
import { Text, View, StyleSheet } from 'react-native';
import { View, StyleSheet } from 'react-native';
import PropTypes from 'prop-types';
import { strings } from '../../../../locales/i18n';
import StyledButton from '../StyledButton'; // eslint-disable-line import/no-unresolved
import AssetIcon from '../AssetIcon';
import { fontStyles } from '../../../styles/common';
import Text from '../../Base/Text';

const styles = StyleSheet.create({
rowWrapper: {
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/BiometryButton/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports[`BiometryButton should render correctly 1`] = `
>
<Icon
allowFontScaling={false}
color="#000000"
color="#24292E"
name="ios-finger-print"
size={28}
style={
Expand Down
40 changes: 20 additions & 20 deletions app/components/UI/CustomGas/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ exports[`CustomGas should render correctly 1`] = `
<TouchableOpacity>
<Icon
allowFontScaling={false}
color="#000000"
color="#24292E"
name="ios-arrow-back"
size={24}
/>
Expand All @@ -36,7 +36,7 @@ exports[`CustomGas should render correctly 1`] = `
style={
Object {
"alignSelf": "center",
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 14,
"fontWeight": "600",
Expand Down Expand Up @@ -85,7 +85,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand Down Expand Up @@ -113,7 +113,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand Down Expand Up @@ -189,7 +189,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 10,
"fontWeight": "600",
Expand All @@ -214,7 +214,7 @@ exports[`CustomGas should render correctly 1`] = `
style={
Array [
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 10,
"fontWeight": "400",
Expand All @@ -232,7 +232,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 10,
"fontWeight": "400",
Expand Down Expand Up @@ -280,7 +280,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 10,
"fontWeight": "600",
Expand All @@ -305,7 +305,7 @@ exports[`CustomGas should render correctly 1`] = `
style={
Array [
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 10,
"fontWeight": "400",
Expand All @@ -323,7 +323,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 10,
"fontWeight": "400",
Expand Down Expand Up @@ -370,7 +370,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 10,
"fontWeight": "600",
Expand All @@ -395,7 +395,7 @@ exports[`CustomGas should render correctly 1`] = `
style={
Array [
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 10,
"fontWeight": "400",
Expand All @@ -413,7 +413,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 10,
"fontWeight": "400",
Expand All @@ -427,7 +427,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
Expand Down Expand Up @@ -463,7 +463,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"flex": 1,
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
Expand All @@ -488,7 +488,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 14,
"fontWeight": "600",
Expand All @@ -514,7 +514,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"flex": 1,
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
Expand All @@ -534,7 +534,7 @@ exports[`CustomGas should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 8,
"borderWidth": 1,
"color": "#000000",
"color": "#24292E",
"flex": 1,
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 14,
Expand All @@ -560,7 +560,7 @@ exports[`CustomGas should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"flex": 1,
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
Expand All @@ -580,7 +580,7 @@ exports[`CustomGas should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 8,
"borderWidth": 1,
"color": "#000000",
"color": "#24292E",
"flex": 1,
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 14,
Expand Down
3 changes: 2 additions & 1 deletion app/components/UI/Notification/BaseNotification/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React from 'react';
import { TouchableOpacity, StyleSheet, View, Text } from 'react-native';
import { TouchableOpacity, StyleSheet, View } from 'react-native';
import PropTypes from 'prop-types';
import { colors, fontStyles, baseStyles } from '../../../../styles/common';
import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons';
import AnimatedSpinner from '../../AnimatedSpinner';
import { strings } from '../../../../../locales/i18n';
import IonicIcon from 'react-native-vector-icons/Ionicons';
import AntIcon from 'react-native-vector-icons/AntDesign';
import Text from '../../../Base/Text';

const styles = StyleSheet.create({
defaultFlashFloating: {
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/SlippageSlider/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ exports[`SlippageSlider should render correctly 1`] = `
"bottom": 0,
"height": 30,
"position": "absolute",
"shadowColor": "#000000",
"shadowColor": "#24292E",
"shadowOffset": Object {
"height": 0,
"width": 0,
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/Tabs/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ exports[`Tabs should render correctly 1`] = `
"marginBottom": 0,
"paddingHorizontal": 20,
"paddingTop": 17,
"shadowColor": "#000000",
"shadowColor": "#24292E",
"shadowOffset": Object {
"height": 12,
"width": 0,
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/TransactionHeader/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ exports[`TransactionHeader should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 14,
"fontWeight": "600",
Expand Down Expand Up @@ -87,7 +87,7 @@ exports[`TransactionHeader should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
Expand Down
14 changes: 7 additions & 7 deletions app/components/UI/TransactionReview/TransactionReviewData/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ exports[`TransactionReviewData should render correctly 1`] = `
<TouchableOpacity>
<Icon
allowFontScaling={false}
color="#000000"
color="#24292E"
name="ios-arrow-back"
size={24}
/>
Expand All @@ -38,7 +38,7 @@ exports[`TransactionReviewData should render correctly 1`] = `
style={
Object {
"alignSelf": "center",
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 14,
"fontWeight": "600",
Expand All @@ -57,7 +57,7 @@ exports[`TransactionReviewData should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand Down Expand Up @@ -92,7 +92,7 @@ exports[`TransactionReviewData should render correctly 1`] = `
style={
Array [
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand All @@ -111,7 +111,7 @@ exports[`TransactionReviewData should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand All @@ -123,7 +123,7 @@ exports[`TransactionReviewData should render correctly 1`] = `
style={
Array [
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand Down Expand Up @@ -170,7 +170,7 @@ exports[`TransactionReviewData should render correctly 1`] = `
style={
Object {
"backgroundColor": "#FFFFFF",
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand Down
2 changes: 1 addition & 1 deletion ...components/UI/TransactionReview/TransactionReviewSummary/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`TransactionReviewSummary should render correctly 1`] = `
"borderColor": "#848c96",
"borderRadius": 12,
"borderWidth": 1,
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 10,
"fontWeight": "400",
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/WhatsNewModal/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ exports[`WhatsNewModal should render correctly 1`] = `
<Text
style={
Object {
"color": "#000000",
"color": "#24292E",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 18,
"fontWeight": "600",
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/AccountBackupStep1B/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ exports[`AccountBackupStep1B should render correctly 1`] = `
"elevation": 4,
"marginBottom": 20,
"padding": 16,
"shadowColor": "#000000",
"shadowColor": "#24292E",
"shadowOffset": Object {
"height": 4,
"width": 1,
Expand Down
Loading