Merge pull request #17 from mgmman/master

src/components/cities-list.tsx

@@ -3,6 +3,7 @@ import { CITIES } from '../consts/cities.ts';
 import { City } from '../dataTypes/city.ts';
 import { useAppDispatch } from '../store/store.ts';
 import { changeCity } from '../store/offers/offers.slice.ts';
+import { fetchOffers } from '../store/async-actions.ts';
 
 interface CitiesListProps {
   activeCityName: string;
@@ -25,7 +26,10 @@ function CitiesListImpl({
               ) : (
                 <div
                   className="locations__item-link tabs__item"
-                  onClick={() => dispatch(changeCity(city))}
+                  onClick={() => {
+                    dispatch(fetchOffers());
+                    dispatch(changeCity(city));
+                  }}
                 >
                   <span>{city.name}</span>
                 </div>

src/components/layout/header.tsx

@@ -1,22 +1,30 @@
 import { Link } from 'react-router-dom';
 import { AppRoute } from '../../dataTypes/enums/app-route.ts';
-import { useAppSelector } from '../../store/store.ts';
+import { useAppDispatch, useAppSelector } from '../../store/store.ts';
 import { memo } from 'react';
 import { UserInfo } from './user-info.tsx';
 import { getIsAuthorized } from '../../store/user/user.selectors.ts';
+import { fetchOffers } from '../../store/async-actions.ts';
 
 interface HeaderProps {
   dontShowUserInfo: boolean;
 }
 
 function HeaderImpl({ dontShowUserInfo }: HeaderProps) {
+  const dispatch = useAppDispatch();
   const isAuthorized = useAppSelector(getIsAuthorized);
   return (
     <header className="header">
       <div className="container">
         <div className="header__wrapper">
           <div className="header__left">
-            <Link className="header__logo-link" to={AppRoute.MainPage}>
+            <Link
+              className="header__logo-link"
+              to={AppRoute.MainPage}
+              onClick={() => {
+                dispatch(fetchOffers());
+              }}
+            >
               <img
                 className="header__logo"
                 src="img/logo.svg"

src/store/offers/offers.selector.test.ts

@@ -14,7 +14,7 @@ describe('offers selectors test', () => {
       city: AMSTERDAM,
       offers: getMockOffers(3),
       sorting: (offers: Offer[]) =>
-        offers.toSorted((a, b) => a.price - b.price),
+        offers.sort((a, b) => a.price - b.price),
       favoritesOffers: getMockOffers(4),
     },
   };