Changed image url concatenations to use createUrlPath helper

src/components/message/Message.tsx

@@ -76,7 +76,9 @@ const Message: FC<MessageProps> = ({
   const avatar = !isMyMessage && isAvatarVisible && (
     <Link onClick={handleLinkClick} to={pathToProfile}>
       <Avatar
-        src={photo && `${import.meta.env.VITE_APP_IMG_USER_URL}${photo}`}
+        src={
+          photo && createUrlPath(import.meta.env.VITE_APP_IMG_USER_URL, photo)
+        }
         sx={spliceSx(styles.avatar, sx.avatar)}
       />
     </Link>

src/components/user-profile-info/UserProfileInfo.tsx

@@ -67,7 +67,7 @@ const UserProfileInfo: FC<UserProfileInfoProps> = ({
 
   const avatar = (
     <Avatar
-      src={photo && `${import.meta.env.VITE_APP_IMG_USER_URL}${photo}`}
+      src={photo && createUrlPath(import.meta.env.VITE_APP_IMG_USER_URL, photo)}
       sx={spliceSx(styles.avatar, sx.avatar)}
     />
   )

src/containers/about-chat-sidebar/AboutChatSidebar.tsx

@@ -91,7 +91,8 @@ const AboutChatSidebar: FC<AboutChatSidebarProps> = ({
             <Box sx={styles.chatInfo}>
               <Avatar
                 src={
-                  photo && `${import.meta.env.VITE_APP_IMG_USER_URL}${photo}`
+                  photo &&
+                  createUrlPath(import.meta.env.VITE_APP_IMG_USER_URL, photo)
                 }
                 sx={styles.userAvatar}
               />

src/containers/chat/chat-item/ChatItem.tsx

@@ -15,7 +15,7 @@ import {
   OverlapEnum,
   PositionEnum
 } from '~/types'
-import { getFormattedDate } from '~/utils/helper-functions'
+import { createUrlPath, getFormattedDate } from '~/utils/helper-functions'
 
 interface ItemOfChatProps {
   isActiveChat: boolean
@@ -84,7 +84,10 @@ const ChatItem: FC<ItemOfChatProps> = ({
           overlap={OverlapEnum.Circular}
         >
           <Avatar
-            src={photo && `${import.meta.env.VITE_APP_IMG_USER_URL}${photo}`}
+            src={
+              photo &&
+              createUrlPath(import.meta.env.VITE_APP_IMG_USER_URL, photo)
+            }
             sx={styles.img}
           />
         </Badge>

src/containers/edit-profile/profile-tab/profile-tab-form/ProfileTabForm.tsx

@@ -32,6 +32,7 @@ import { snackbarVariants } from '~/constants'
 import { imageResize } from '~/utils/image-resize'
 import { styles } from '~/containers/edit-profile/profile-tab/profile-tab-form/ProfileTabForm.styles'
 import { openAlert } from '~/redux/features/snackbarSlice'
+import { createUrlPath } from '~/utils/helper-functions'
 
 export interface ProfileTabFormProps {
   data: EditProfileForm
@@ -106,7 +107,7 @@ const ProfileTabForm: FC<ProfileTabFormProps> = ({
   const { photo } = data
   const photoToDisplay =
     typeof photo === 'string'
-      ? photo && `${import.meta.env.VITE_APP_IMG_USER_URL}${photo}`
+      ? photo && createUrlPath(import.meta.env.VITE_APP_IMG_USER_URL, photo)
       : photo?.src
 
   return (

src/containers/my-cooperations/my-cooperations-details/MyCooperationsDetails.tsx

@@ -104,7 +104,10 @@ const MyCooperationsDetails = () => {
             <Avatar
               src={
                 offer.author.photo &&
-                `${import.meta.env.VITE_APP_IMG_USER_URL}${offer.author.photo}`
+                createUrlPath(
+                  import.meta.env.VITE_APP_IMG_USER_URL,
+                  offer.author.photo
+                )
               }
             />
             <Typography sx={style.profileName}>

src/containers/navigation-icons/AccountIcon.tsx

@@ -13,6 +13,7 @@ import { defaultResponses } from '~/constants'
 import { styles } from '~/containers/navigation-icons/NavigationIcons.styles'
 
 import { UserResponse, UserRole } from '~/types'
+import { createUrlPath } from '~/utils/helper-functions'
 
 interface AccountIconProps {
   openMenu: (event: MouseEvent) => void
@@ -45,7 +46,10 @@ const AccountIcon: FC<AccountIconProps> = ({ openMenu }) => {
       <Avatar
         alt='User Avatar'
         onClick={openMenu}
-        src={`${import.meta.env.VITE_APP_IMG_USER_URL}${photo}`}
+        src={
+          photo &&
+          createUrlPath(import.meta.env.VITE_APP_IMG_USER_URL || '', photo)
+        }
         sx={styles.accountIcon}
       >
         {!loading && firstName && lastName && `${firstName[0]}${lastName[0]}`}

src/containers/user-profile/profile-info/ProfileContainerDesktop.jsx

@@ -8,6 +8,7 @@ import AppChipList from '~/components/app-chips-list/AppChipList'
 import ProfileDoneItemsList from '~/components/icon-with-text-list/ProfileDoneItemsList'
 
 import { styles } from '~/containers/user-profile/profile-info/ProfileInfo.styles'
+import { createUrlPath } from '~/utils/helper-functions'
 
 const ProfileContainerDesktop = ({
   userData,
@@ -24,7 +25,7 @@ const ProfileContainerDesktop = ({
         <Avatar
           src={
             userData.photo &&
-            `${import.meta.env.VITE_APP_IMG_USER_URL}${userData.photo}`
+            createUrlPath(import.meta.env.VITE_APP_IMG_USER_URL, userData.photo)
           }
           sx={styles.img}
         />

src/containers/user-profile/profile-info/ProfileContainerMobile.jsx

@@ -8,6 +8,7 @@ import AppChipList from '~/components/app-chips-list/AppChipList'
 import ProfileDoneItemsList from '~/components/icon-with-text-list/ProfileDoneItemsList'
 
 import { styles } from '~/containers/user-profile/profile-info/ProfileInfo.styles'
+import { createUrlPath } from '~/utils/helper-functions'
 
 const ProfileContainerMobile = ({
   actionIcon,
@@ -25,7 +26,10 @@ const ProfileContainerMobile = ({
           <Avatar
             src={
               userData.photo &&
-              `${import.meta.env.VITE_APP_IMG_USER_URL}${userData.photo}`
+              createUrlPath(
+                import.meta.env.VITE_APP_IMG_USER_URL,
+                userData.photo
+              )
             }
             sx={styles.img}
           />

src/utils/helper-functions.tsx

@@ -206,7 +206,7 @@ export const createUrlPath = (
   query = {}
 ) => {
   let trimmedUrl = URL
-  while (trimmedUrl.endsWith('/')) {
+  while (trimmedUrl && trimmedUrl.endsWith('/')) {
     trimmedUrl = trimmedUrl.slice(0, -1)
   }