Просмотр исходного кода

Merge branch 'post-token' of Viktoriia/nomadmania-app into dev

Viktoriia 1 год назад
Родитель
Сommit
68983ab658

+ 1 - 1
src/modules/api/photos/photos-api.tsx

@@ -93,7 +93,7 @@ export const photosApi = {
   setUploadTemp: (data: PostSetTempData) => {
     const formData = new FormData();
 
-    formData.append('token', JSON.stringify(data.token));
+    formData.append('token', data.token);
     formData.append('file', {
       ...data.file
     } as unknown as Blob);

+ 1 - 1
src/modules/api/user/user-api.tsx

@@ -196,7 +196,7 @@ export const userApi = {
   setProfileData: (data: PostSetProfileData) => {
     const formData = new FormData();
 
-    formData.append('token', JSON.stringify(data.token));
+    formData.append('token', data.token);
     formData.append('user', JSON.stringify(data.user));
     formData.append('photo', {
       ...data.photo

+ 2 - 2
src/screens/InAppScreens/TravelsScreen/CountriesScreen/index.tsx

@@ -21,8 +21,8 @@ import InfoIcon from 'assets/icons/info-solid.svg';
 import { NAVIGATION_PAGES } from 'src/types';
 
 const CountriesScreen = () => {
-  const token = storage.get('token', StoreType.STRING) as string;
-  const { data } = useGetSlowQuery(String(token));
+  const token = storage.get('token', StoreType.STRING) as string || '';
+  const { data } = useGetSlowQuery(token);
   const { mutate: updateSlow } = usePostSetSlowMutation();
   const [slow, setSlow] = useState<SlowData[] | null>(null);
   const [megaSelectorVisible, setMegaSelectorVisible] = useState(false);

+ 2 - 2
src/screens/InAppScreens/TravelsScreen/DareScreen/index.tsx

@@ -23,8 +23,8 @@ import InfoIcon from 'assets/icons/info-solid.svg';
 import { NAVIGATION_PAGES } from 'src/types';
 
 const DareScreen = () => {
-  const token = storage.get('token', StoreType.STRING) as string;
-  const { data: megaregions } = useGetMegaregionsDareQuery(String(token), true);
+  const token = storage.get('token', StoreType.STRING) as string || '';
+  const { data: megaregions } = useGetMegaregionsDareQuery(token, true);
   const [megaSelectorVisible, setMegaSelectorVisible] = useState(false);
   const [selectedMega, setSelectedMega] = useState<{ name: string; id: number }>({
     id: 1,

+ 1 - 1
src/screens/InAppScreens/TravelsScreen/EarthScreen/index.tsx

@@ -23,7 +23,7 @@ interface PropertiesData {
 }
 
 const EarthScreen = () => {
-  const token = storage.get('token', StoreType.STRING) as string;
+  const token = storage.get('token', StoreType.STRING) as string || '';
   const [geojson, setGeojson] = useState<FeatureCollection>(kye as FeatureCollection);
   const { data } = useGetKyeQuery(token, true);
   const { mutateAsync } = usePostSetKye();

+ 2 - 2
src/screens/InAppScreens/TravelsScreen/RegionsScreen/index.tsx

@@ -27,14 +27,14 @@ import InfoIcon from 'assets/icons/info-solid.svg';
 import { NAVIGATION_PAGES } from 'src/types';
 
 const RegionsScreen = () => {
-  const token = storage.get('token', StoreType.STRING) as string;
+  const token = storage.get('token', StoreType.STRING) as string || '';
   const { data: megaregions } = useGetMegaregionsQuery(token, true);
   const [megaSelectorVisible, setMegaSelectorVisible] = useState(false);
   const [selectedMega, setSelectedMega] = useState<{ name: string; id: number }>({
     id: 1,
     name: 'SOUTHERN EUROPE'
   });
-  const { data: regionsQe } = useGetRegionQeQuery(selectedMega.id, String(token), true);
+  const { data: regionsQe } = useGetRegionQeQuery(selectedMega.id, token, true);
   const [total, setTotal] = useState(0);
   const [isEditModalVisible, setIsEditModalVisible] = useState(false);
   const [contentIndex, setContentIndex] = useState(0);