diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7b7f9a11..dda1c8c7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,11 +14,11 @@ name: "CodeQL" on: push: branches: [ main ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ main ] - schedule: - - cron: '35 4 * * 4' + # pull_request: + # # The branches below must be a subset of the branches above + # branches: [ main ] + # schedule: + # - cron: '35 4 * * 4' jobs: analyze: diff --git a/src/screens/Tabs/Shared/Account/Information/Account.tsx b/src/screens/Tabs/Shared/Account/Information/Account.tsx index 6e4a8cbd..31a3f1fb 100644 --- a/src/screens/Tabs/Shared/Account/Information/Account.tsx +++ b/src/screens/Tabs/Shared/Account/Information/Account.tsx @@ -7,7 +7,7 @@ import { } from '@utils/slices/instancesSlice' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' -import React, { useMemo } from 'react' +import React from 'react' import { useTranslation } from 'react-i18next' import { View } from 'react-native' import { useSelector } from 'react-redux' @@ -35,23 +35,6 @@ const AccountInformationAccount: React.FC = ({ options: { enabled: account !== undefined } }) - const movedContent = useMemo(() => { - if (account?.moved) { - return ( - - @{account.moved.acct} - - ) - } - }, [account?.moved]) - if (account || (localInstance && instanceAccount)) { return ( = ({ marginBottom: StyleConstants.Spacing.L }} > - - @{localInstance ? instanceAccount?.acct : account?.acct} - {localInstance ? `@${instanceUri}` : null} - - {relationship?.followed_by ? ( - - {t('shared.account.followed_by')} + + {account?.moved ? ( + <> + {' '} + @{account.moved.acct} + + ) : null} + + @{localInstance ? instanceAccount?.acct : account?.acct} + {localInstance ? `@${instanceUri}` : null} - ) : null} - {movedContent} + {relationship?.followed_by ? t('shared.account.followed_by') : null} + {account?.locked ? (