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

AUT-19663 | LOCO | Service text is MORE cutoff after clicking to expend #823

Merged
merged 2 commits into from
Apr 15, 2024
+6 −3
Merged

AUT-19663 | LOCO | Service text is MORE cutoff after clicking to expend #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b96cd5
remove number of lines limit in single display
ariel-weiss Apr 11, 2024
b2d4963
Merge branch 'version_3.3.17' into AUT-19663-services-text-long
ariel-weiss Apr 15, 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
6 changes: 4 additions & 2 deletions ...ocomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/ServiceCard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import showPriceBasedOnAccount from '../../../../../../services/showPriceBasedOn

const FARE_POPUP = 'farePopup';

const ServiceCard = ({ service, withBorder, testID }) => {
const ServiceCard = ({
service, withBorder, testID, descriptionNumberOfLines,
}) => {
const { businessAccountId } = useContext(RidePageContext);
const theme = useContext(ThemeContext);
const {
Expand Down Expand Up @@ -90,7 +92,7 @@ const ServiceCard = ({ service, withBorder, testID }) => {
};

const getDescription = forFutureRidesView => (
<Description style={{ ...(forFutureRidesView && { width: '60%' }) }} numberOfLines={2}>
<Description style={{ ...(forFutureRidesView && { width: '60%' }) }} numberOfLines={descriptionNumberOfLines || null}>
{(service.description || '')}
</Description>
);
Expand Down
3 changes: 2 additions & 1 deletion ...les/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ const ServiceOptions = () => {
<ServiceCard
withBorder
service={option}
key={option.name}
key={option.id}
descriptionNumberOfLines={2}
/>
))
}
Expand Down
Loading