fix(pirateship): fixes prods text and shop all cats to dark gray #130
Conversation
dfrho
commented
Aug 3, 2018
dfrho
commented
- Featured Products and Shop All Categories text color set to palette.secondary === grays.eight
- Same with brand text (ie. "Sony")
| @@ -112,8 +113,8 @@ const ShopStyle = StyleSheet.create({ | |||
|
|
|||
| export interface ShopProps | |||
There was a problem hiding this comment.
Since there is no additional props, this can be a type.
export type ShopProps = ScreenProps & Pick<........>
|
@dfrho - you don't need to implement pav's suggestion because you didn't modify the types, but you'll have to fix this conflict. Let me know if you need any assistance. |
|
Added navigator type to ScreenWrapper and settled merge conflicts. |
| export interface PSScreenWrapperProps { | ||
| style?: StyleProp<ViewStyle>; | ||
|
|
||
| hideGlobalBanner?: boolean; | ||
| overrideGlobalBanner?: PSGlobalBannerSlotItem; | ||
|
|
||
| needInSafeArea?: boolean; | ||
| navigator?: Navigator; |
There was a problem hiding this comment.
I don't think this is necessary because we're defining navigator on line 46. If you're getting a tsc error it's probably coming from somewhere else.
|
just pushed a cleaner version removing the extra navigator props on interface PSScreenWrapperProps. |
|
@dfrho - conflicts :( I'd recommend copying your work into a new branch and submitting a new PR. |
|
@bweissbart on it, thanks Brett |
