Skip to content

Commit

Permalink
Fix 'Close' label wrapping on Android wallet disclaimer (keybase#20194)
Browse files Browse the repository at this point in the history
  • Loading branch information
cjb authored Oct 8, 2019
1 parent 03a50b7 commit cd5b608
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 24 deletions.
15 changes: 3 additions & 12 deletions shared/wallets/onboarding/disclaimer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,10 @@ class Disclaimer extends React.Component<DisclaimerProps, DisclaimerState> {
Styles.isMobile
? {
leftButton: (
<Kb.Button
key={0}
type="Dim"
mode="Primary"
small={true}
label="Close"
onClick={props.onNotNow}
style={styles.closeButton}
labelStyle={styles.closeLabelStyle}
/>
<Kb.Text style={styles.closeLabelStyle} type="BodyBigLink" onClick={props.onNotNow}>
Close
</Kb.Text>
),
style: styles.background,
}
: undefined
}
Expand Down Expand Up @@ -356,7 +348,6 @@ const styles = Styles.styleSheetCreate(
}),
buttonLabelStyle: {color: Styles.globalColors.purpleDark},
buttonStyle: {backgroundColor: Styles.globalColors.white, width: '100%'},
closeButton: {backgroundColor: Styles.globalColors.transparent},
closeLabelStyle: {color: Styles.globalColors.white},
container: {
backgroundColor: Styles.globalColors.purple,
Expand Down
15 changes: 3 additions & 12 deletions shared/wallets/onboarding/intro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ const Intro = (props: IntroProps) => {
Styles.isMobile
? {
leftButton: (
<Kb.Button
key={0}
type="Dim"
mode="Primary"
small={true}
label="Close"
onClick={props.onClose}
style={styles.closeButton}
labelStyle={styles.closeLabelStyle}
/>
<Kb.Text style={styles.closeLabelStyle} type="BodyBigLink" onClick={props.onClose}>
Close
</Kb.Text>
),
style: styles.background,
}
: undefined
}
Expand Down Expand Up @@ -90,7 +82,6 @@ const styles = Styles.styleSheetCreate(
marginTop: Styles.globalMargins.small,
},
buttonStyle: {backgroundColor: Styles.globalColors.white},
closeButton: {backgroundColor: Styles.globalColors.transparent},
closeLabelStyle: {color: Styles.globalColors.white},
container: {
backgroundColor: Styles.globalColors.purple,
Expand Down

0 comments on commit cd5b608

Please sign in to comment.