diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index cc97741df..c94991fd8 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -397,9 +397,9 @@ import Views } .padding(.top, 0) .listStyle(PlainListStyle()) - .alert("Are you sure you want to remove this item? All associated notes and highlights will be deleted.", + .alert("Are you sure you want to delete this item? All associated notes and highlights will be deleted.", isPresented: $confirmationShown) { - Button("Remove Item") { + Button("Delete Item") { if let itemToRemove = itemToRemove { withAnimation { viewModel.removeLink(dataService: dataService, objectID: itemToRemove.objectID) @@ -486,8 +486,8 @@ import Views } } } - .alert("Are you sure you want to remove this item? All associated notes and highlights will be deleted.", isPresented: $confirmationShown) { - Button("Remove Item", role: .destructive) { + .alert("Are you sure you want to delete this item? All associated notes and highlights will be deleted.", isPresented: $confirmationShown) { + Button("Delete Item", role: .destructive) { if let itemToRemove = itemToRemove { withAnimation { viewModel.removeLink(dataService: dataService, objectID: itemToRemove.objectID) diff --git a/packages/web/components/elements/StyledText.tsx b/packages/web/components/elements/StyledText.tsx index 14258784c..f1c6b5c61 100644 --- a/packages/web/components/elements/StyledText.tsx +++ b/packages/web/components/elements/StyledText.tsx @@ -52,9 +52,10 @@ const textVariants = { margin: 0, }, modalTitle: { - fontSize: '29px', - lineHeight: '37.7px', - color: '$textDefault', + fontSize: '16px', + fontWeight: '600', + color: '$grayText', + lineHeight: '1.50', margin: 0, }, boldText: { @@ -194,13 +195,10 @@ export const StyledList = styled('ul', { color: '$grayTextContrast', }) -export const StyledImg = styled('img', { -}) +export const StyledImg = styled('img', {}) export const StyledAnchor = styled('a', { - textDecoration: 'none' + textDecoration: 'none', }) -export const StyledMark = styled('mark', { - -}) +export const StyledMark = styled('mark', {}) diff --git a/packages/web/components/patterns/ConfirmationModal.tsx b/packages/web/components/patterns/ConfirmationModal.tsx index 8e553c8f1..0e9f3ca17 100644 --- a/packages/web/components/patterns/ConfirmationModal.tsx +++ b/packages/web/components/patterns/ConfirmationModal.tsx @@ -11,6 +11,7 @@ import { useEffect, useRef } from 'react' type ConfirmationModalProps = { message?: string + richMessage?: React.ReactNode icon?: React.ReactNode acceptButtonLabel?: string onAccept: () => void @@ -24,7 +25,11 @@ export function ConfirmationModal(props: ConfirmationModalProps): JSX.Element { {props.icon ? props.icon : null} - {props.message} + {props.richMessage ? ( + props.richMessage + ) : ( + {props.message} + )} + + + + + + ) +} diff --git a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx index 420e7c4c2..178f6148e 100644 --- a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx +++ b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx @@ -1158,10 +1158,34 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element { )} {showRemoveLinkConfirmation && ( + + Are you sure you want to delete this item? All associated notes + and highlights will be deleted. + + {props.linkToRemove?.node && viewerData?.me && ( + + {}} + /> + + )} + } onAccept={removeItem} + acceptButtonLabel="Delete Item" onOpenChange={() => setShowRemoveLinkConfirmation(false)} /> )}