diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 14:17:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-28 14:17:00 +0100 |
| commit | 1a7aa37b60769a10077c585fa76ec848b6866d9a (patch) | |
| tree | 9ea5aa74454bee29bf7be75c516e269fae296440 /app/javascript/flavours/glitch/features/account_timeline/index.js | |
| parent | 6517b7b9f02f8590a8f9c5aa04e3ef9efeb4e757 (diff) | |
| parent | f51990bd62f434f377b5bbcbaa0ea205a87af403 (diff) | |
Merge pull request #1976 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/account_timeline/index.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/account_timeline/index.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/account_timeline/index.js b/app/javascript/flavours/glitch/features/account_timeline/index.js index b735af0ac..b79082f00 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/index.js +++ b/app/javascript/flavours/glitch/features/account_timeline/index.js @@ -25,7 +25,13 @@ const emptyList = ImmutableList(); const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = false }) => { const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]); - if (!accountId) { + if (accountId === null) { + return { + isLoading: false, + isAccount: false, + statusIds: emptyList, + }; + } else if (!accountId) { return { isLoading: true, statusIds: emptyList, |