From 077f9228cc4e45b97583adaee5092d2b25a8e405 Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Mon, 18 Nov 2024 21:42:07 +0000 Subject: [PATCH 1/2] use outline style for repost cancel button --- src/view/com/util/post-ctrls/RepostButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/com/util/post-ctrls/RepostButton.tsx b/src/view/com/util/post-ctrls/RepostButton.tsx index eb7505d2ed5..e7e10cd24f3 100644 --- a/src/view/com/util/post-ctrls/RepostButton.tsx +++ b/src/view/com/util/post-ctrls/RepostButton.tsx @@ -193,7 +193,7 @@ let RepostButtonDialogInner = ({ label={_(msg`Cancel quote post`)} onPress={onPressClose} size="large" - variant="solid" + variant="outline" color="primary"> {_(msg`Cancel`)} From 71777343044b6ad2123b85b600b17ae939d17dff Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Mon, 18 Nov 2024 21:55:13 +0000 Subject: [PATCH 2/2] use trans macro in JSX --- src/view/com/util/post-ctrls/RepostButton.tsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/view/com/util/post-ctrls/RepostButton.tsx b/src/view/com/util/post-ctrls/RepostButton.tsx index e7e10cd24f3..06b1fcaf6bf 100644 --- a/src/view/com/util/post-ctrls/RepostButton.tsx +++ b/src/view/com/util/post-ctrls/RepostButton.tsx @@ -1,6 +1,6 @@ import React, {memo, useCallback} from 'react' import {View} from 'react-native' -import {msg, plural} from '@lingui/macro' +import {msg, plural, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {POST_CTRL_HITSLOP} from '#/lib/constants' @@ -151,9 +151,11 @@ let RepostButtonDialogInner = ({ color="primary"> - {isReposted - ? _(msg`Remove repost`) - : _(msg({message: `Repost`, context: 'action'}))} + {isReposted ? ( + Remove repost + ) : ( + Repost + )} @@ -195,7 +199,9 @@ let RepostButtonDialogInner = ({ size="large" variant="outline" color="primary"> - {_(msg`Cancel`)} + + Cancel +