octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into release

Browse Source
This commit is contained in:
xmflsct
2022-12-05 21:31:09 +01:00
parent 168218e5b1 5338720106
commit 73fa1a81cd
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Timeline/Shared/Actioned.tsx
View File

@ -19,7 +19,7 @@ export interface Props {
const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest }) => { const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest }) => {
const { status, reblogStatus } = useContext(StatusContext) const { status, reblogStatus } = useContext(StatusContext)
const account = rest.account || (reblogStatus ? reblogStatus.account : status?.account) const account = rest.account || (reblogStatus ? reblogStatus.account : status?.account)
if (!status || !account) return null if (!account) return null
const { t } = useTranslation('componentTimeline') const { t } = useTranslation('componentTimeline')
const { colors } = useTheme() const { colors } = useTheme()

22
src/screens/Tabs/Shared/Search/Empty.tsx
View File

@ -72,16 +72,18 @@ const SearchEmpty: React.FC<Props> = ({ isLoading, inputRef, setSearchTerm }) =>
</CustomText> </CustomText>
</View> </View>
<CustomText {trendsTags.data?.length ? (
style={{ <CustomText
color: colors.primaryDefault, style={{
marginTop: StyleConstants.Spacing.M, color: colors.primaryDefault,
paddingHorizontal: StyleConstants.Spacing.Global.PagePadding marginTop: StyleConstants.Spacing.M,
}} paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
fontWeight='Bold' }}
> fontWeight='Bold'
{t('shared.search.empty.trending.tags')} >
</CustomText> {t('shared.search.empty.trending.tags')}
</CustomText>
) : null}
<View> <View>
{trendsTags.data?.map((tag, index) => { {trendsTags.data?.map((tag, index) => {
const hashtag = tag as Mastodon.Tag const hashtag = tag as Mastodon.Tag