Skip to content

[QA-957] Fix android overflowing text on access & sale modal#8313

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

Merged
DejayJD merged 3 commits into from
May 3, 2024
Merged

[QA-957] Fix android overflowing text on access & sale modal #8313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a323663
fixes for text wrapping shenanigans
DejayJD May 1, 2024
6ac089d
Merge branch 'main' of github.com:AudiusProject/audius-protocol into …
DejayJD May 2, 2024
55a2aeb
lint fix
DejayJD May 2, 2024
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
10 changes: 7 additions & 3 deletions packages/mobile/src/components/help-callout/HelpCallout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,9 +51,13 @@ export const HelpCallout = (props: HelpCalloutProps) => {
return (
<View style={[styles.root, style]}>
<Icon fill={neutral} />
<Text numberOfLines={numberOfLines} style={styles.text}>
{content}
</Text>
{typeof content === 'string' ? (
<Text numberOfLines={numberOfLines} style={styles.text}>
{content}
</Text>
) : (
content
)}
</View>
)
}
20 changes: 6 additions & 14 deletions ...reens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { FeatureFlags } from '@audius/common/services'
import { useField } from 'formik'
import { Dimensions, View } from 'react-native'

import { IconCart, IconStars } from '@audius/harmony-native'
import { Flex, IconCart } from '@audius/harmony-native'
import { Link, Tag, Text } from 'app/components/core'
import { HelpCallout } from 'app/components/help-callout/HelpCallout'
import { useSetTrackAvailabilityFields } from 'app/hooks/useSetTrackAvailabilityFields'
Expand DownExpand Up@@ -64,10 +64,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
subtitle: {
color: palette.neutral
},
waitlist: {
gap: spacing(3),
alignItems: 'flex-start'
},
link: {
color: palette.secondary
},
Expand DownExpand Up@@ -136,14 +132,14 @@ export const PremiumRadioField = (props: PremiumRadioFieldProps) => {

const renderHelpCalloutContent = useCallback(() => {
return (
<View style={styles.waitlist}>
<Text>{messages.waitlist}</Text>
<Flex gap='l' alignItems='flex-start'>
<Text style={{ flex: 1 }}>{messages.waitlist}</Text>
<Link url={WAITLIST_TYPEFORM} onPress={handlePressWaitListLink}>
<Text style={styles.link}>{messages.join}</Text>
</Link>
</View>
</Flex>
)
}, [styles.link, styles.waitlist, handlePressWaitListLink])
}, [handlePressWaitListLink, styles.link])

return (
<View style={styles.root}>
Expand All@@ -163,11 +159,7 @@ export const PremiumRadioField = (props: PremiumRadioFieldProps) => {
{!isUsdcUploadEnabled ? (
<>
<Tag style={styles.comingSoon}>{messages.comingSoon}</Tag>
<HelpCallout
icon={IconStars}
style={styles.waitlist}
content={renderHelpCalloutContent()}
/>
<HelpCallout content={renderHelpCalloutContent()} />
</>
) : null}
{selected ? (
Expand Down