diff --git a/app/soapbox/features/feed-filtering/__tests__/feed-carousel.test.tsx b/app/soapbox/features/feed-filtering/__tests__/feed-carousel.test.tsx index 4744b1c52..096682fa0 100644 --- a/app/soapbox/features/feed-filtering/__tests__/feed-carousel.test.tsx +++ b/app/soapbox/features/feed-filtering/__tests__/feed-carousel.test.tsx @@ -86,10 +86,10 @@ describe('', () => { __stub(mock => { mock.onGet('/api/v1/truth/carousels/avatars') .reply(200, [ - { account_id: '1', username: 'a', account_avatar: 'https://example.com/some.jpg' }, - { account_id: '2', username: 'b', account_avatar: 'https://example.com/some.jpg' }, - { account_id: '3', username: 'c', account_avatar: 'https://example.com/some.jpg' }, - { account_id: '4', username: 'd', account_avatar: 'https://example.com/some.jpg' }, + { account_id: '1', acct: 'a', account_avatar: 'https://example.com/some.jpg' }, + { account_id: '2', acct: 'b', account_avatar: 'https://example.com/some.jpg' }, + { account_id: '3', acct: 'c', account_avatar: 'https://example.com/some.jpg' }, + { account_id: '4', acct: 'd', account_avatar: 'https://example.com/some.jpg' }, ]); }); diff --git a/app/soapbox/features/feed-filtering/feed-carousel.tsx b/app/soapbox/features/feed-filtering/feed-carousel.tsx index 2ca9f34bc..6a50f39df 100644 --- a/app/soapbox/features/feed-filtering/feed-carousel.tsx +++ b/app/soapbox/features/feed-filtering/feed-carousel.tsx @@ -12,7 +12,7 @@ import PlaceholderAvatar from '../placeholder/components/placeholder_avatar'; const CarouselItem = ({ avatar }: { avatar: any }) => { const dispatch = useAppDispatch(); - const selectedAccountId = useAppSelector(state => state.timelines.getIn(['home', 'feedAccountId'])); + const selectedAccountId = useAppSelector(state => state.timelines.get('home')?.feedAccountId); const isSelected = avatar.account_id === selectedAccountId; const handleClick = () => @@ -37,11 +37,11 @@ const CarouselItem = ({ avatar }: { avatar: any }) => { 'ring-transparent': !isSelected, 'ring-primary-600': isSelected, })} - alt={avatar.username} + alt={avatar.acct} /> - {avatar.username} + {avatar.acct} ); diff --git a/app/soapbox/features/home_timeline/index.tsx b/app/soapbox/features/home_timeline/index.tsx index f1494198a..3e9fa5346 100644 --- a/app/soapbox/features/home_timeline/index.tsx +++ b/app/soapbox/features/home_timeline/index.tsx @@ -19,7 +19,7 @@ const HomeTimeline: React.FC = () => { const polling = useRef(null); const isPartial = useAppSelector(state => state.timelines.get('home')?.isPartial === true); - const currentAccountId = useAppSelector(state => state.timelines.getIn(['home', 'feedAccountId'])); + const currentAccountId = useAppSelector(state => state.timelines.get('home')?.feedAccountId); const siteTitle = useAppSelector(state => state.instance.title); const handleLoadMore = (maxId: string) => {