From 931cc76a47f39989b18ffc0d8bfc4b265b5a79c0 Mon Sep 17 00:00:00 2001
From: hamid zarghami <hamid.zarghami1@gmail.com>
Date: Sat, 6 Jun 2026 11:48:22 +0330
Subject: [PATCH] update address

---
 .../[id]/components/AddressSelectionModal.tsx | 15 +++++++++
 .../profile/address/hooks/useAddressData.ts   |  3 +-
 .../new/components/AddressDetailsModal.tsx    |  8 +++--
 .../address/new/components/AddressDisplay.tsx | 19 ++++++-----
 .../(Profile)/profile/address/new/page.tsx    | 32 +++++++++++++++----
 .../address/new/utils/formatAddress.ts        |  6 +++-
 .../[name]/(Profile)/profile/address/page.tsx |  7 +++-
 7 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSelectionModal.tsx b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSelectionModal.tsx
index 5963699..4848fbc 100644
--- a/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSelectionModal.tsx
+++ b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSelectionModal.tsx
@@ -6,6 +6,7 @@ import Modal from '@/components/utils/Modal';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import { ef } from '@/lib/helpers/utfNumbers';
+import { Edit2 } from 'iconsax-react';
 
 const formatAddress = (address: Address) => {
     return `${address.address}، ${address.city}، ${address.province}`;
@@ -78,6 +79,20 @@ export const AddressSelectionModal = ({
                             <p className='text-xs mt-2 text-disabled-text'>
                                 تلفن: {ef(address.phone)}
                             </p>
+                            <div className='mt-3 flex justify-end'>
+                                <Link
+                                    href={`/${name}/profile/address/new?id=${address.id}&redirect=${encodeURIComponent(redirectUrl)}`}
+                                    onClick={(e) => e.stopPropagation()}
+                                >
+                                    <button
+                                        type='button'
+                                        className='text-xs text-primary dark:text-foreground flex items-center gap-1'
+                                    >
+                                        <Edit2 className='size-4 stroke-primary dark:stroke-foreground' />
+                                        ویرایش
+                                    </button>
+                                </Link>
+                            </div>
                         </div>
                     ))}
                 </div>
diff --git a/src/app/[name]/(Profile)/profile/address/hooks/useAddressData.ts b/src/app/[name]/(Profile)/profile/address/hooks/useAddressData.ts
index 70c1fe6..0762a53 100644
--- a/src/app/[name]/(Profile)/profile/address/hooks/useAddressData.ts
+++ b/src/app/[name]/(Profile)/profile/address/hooks/useAddressData.ts
@@ -29,8 +29,9 @@ export const useUpdateAddress = () => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: updateAddress,
-    onSuccess: () => {
+    onSuccess: (_data, variables) => {
       queryClient.invalidateQueries({ queryKey: ["addresses"] });
+      queryClient.invalidateQueries({ queryKey: ["address", variables.id] });
     },
   });
 };
diff --git a/src/app/[name]/(Profile)/profile/address/new/components/AddressDetailsModal.tsx b/src/app/[name]/(Profile)/profile/address/new/components/AddressDetailsModal.tsx
index 3d2dafb..b91199f 100644
--- a/src/app/[name]/(Profile)/profile/address/new/components/AddressDetailsModal.tsx
+++ b/src/app/[name]/(Profile)/profile/address/new/components/AddressDetailsModal.tsx
@@ -2,12 +2,13 @@ import AnimatedBottomSheet from '@/components/bottomsheet/AnimatedBottomSheet';
 import Button from '@/components/button/PrimaryButton';
 import { AddressDisplay } from './AddressDisplay';
 import { AddressForm } from './AddressForm';
-import { NominatimReverseGeocodingResponse } from '../../types/Types';
+import { Address, NominatimReverseGeocodingResponse } from '../../types/Types';
 import { Location } from 'iconsax-react';
 
 interface AddressDetailsModalProps {
     visible: boolean;
     selectedAddress: NominatimReverseGeocodingResponse | null;
+    existingAddress?: Address | null;
     formData: {
         title: string;
         addressDetails: string;
@@ -26,6 +27,7 @@ interface AddressDetailsModalProps {
 export const AddressDetailsModal = ({
     visible,
     selectedAddress,
+    existingAddress,
     formData,
     isPending,
     editMode = false,
@@ -41,13 +43,13 @@ export const AddressDetailsModal = ({
             blurOpacity={null}
             noBlur
             visible={visible}
-            title='آدرس'
+            title={editMode ? 'ویرایش آدرس' : 'آدرس'}
             onClick={onClose}
             overrideClassName='bg-container!'
         >
             <form onSubmit={onSubmit}>
                 <div className='px-4'>
-                    <AddressDisplay selectedAddress={selectedAddress} />
+                    <AddressDisplay selectedAddress={selectedAddress} existingAddress={existingAddress} />
                     {editMode && onChangePosition && (
                         <div className='mt-4 mb-6 flex justify-end'>
                             <Button
diff --git a/src/app/[name]/(Profile)/profile/address/new/components/AddressDisplay.tsx b/src/app/[name]/(Profile)/profile/address/new/components/AddressDisplay.tsx
index b5519f4..868c61d 100644
--- a/src/app/[name]/(Profile)/profile/address/new/components/AddressDisplay.tsx
+++ b/src/app/[name]/(Profile)/profile/address/new/components/AddressDisplay.tsx
@@ -1,19 +1,22 @@
-import { NominatimReverseGeocodingResponse } from '../../types/Types';
-import { formatSelectedAddress } from '../utils/formatAddress';
+import { Address, NominatimReverseGeocodingResponse } from '../../types/Types';
+import { formatAddress, formatSelectedAddress } from '../utils/formatAddress';
 
 interface AddressDisplayProps {
     selectedAddress: NominatimReverseGeocodingResponse | null;
+    existingAddress?: Address | null;
 }
 
-export const AddressDisplay = ({ selectedAddress }: AddressDisplayProps) => {
+export const AddressDisplay = ({ selectedAddress, existingAddress }: AddressDisplayProps) => {
+    const displayText = selectedAddress
+        ? formatSelectedAddress(selectedAddress)
+        : existingAddress
+            ? formatAddress(existingAddress)
+            : 'آدرس را به صورت دستی وارد کنید';
+
     return (
         <div className='px-4 mt-2 bg-container'>
             <span className='text-sm'>
-                {!selectedAddress ? (
-                    'آدرس را به صورت دستی وارد کنید'
-                ) : (
-                    formatSelectedAddress(selectedAddress)
-                )}
+                {displayText}
             </span>
             <hr className='border border-border mt-3 mb-10' />
         </div>
diff --git a/src/app/[name]/(Profile)/profile/address/new/page.tsx b/src/app/[name]/(Profile)/profile/address/new/page.tsx
index e090e76..390ccf4 100644
--- a/src/app/[name]/(Profile)/profile/address/new/page.tsx
+++ b/src/app/[name]/(Profile)/profile/address/new/page.tsx
@@ -6,7 +6,7 @@ import { ArrowLeft } from 'iconsax-react';
 import { useAuthStore } from '@/zustand/authStore';
 import { AddressDetailsModal } from './components/AddressDetailsModal';
 import { useAddressForm } from './hooks/useAddressForm';
-import { useGetAddressById } from '../hooks/useAddressData';
+import { useGetAddresses } from '../hooks/useAddressData';
 import { useGetAbout } from '@/app/[name]/(Main)/about/hooks/useAboutData';
 
 function OrderTrackingPage() {
@@ -15,9 +15,14 @@ function OrderTrackingPage() {
     const id = params.get('id');
     const editMode = !!id;
 
-    const { data: addressResponse, isLoading: isLoadingAddress } = useGetAddressById(id);
+    const { data: addressesResponse, isLoading: isLoadingAddresses } = useGetAddresses();
     const { data: aboutData } = useGetAbout();
-    const address = addressResponse?.data;
+
+    const address = useMemo(() => {
+        if (!editMode || !id) return null;
+        return addressesResponse?.data?.find((item) => item.id === id) ?? null;
+    }, [editMode, id, addressesResponse?.data]);
+
     const user = useAuthStore((state) => state.user);
     const restaurant = aboutData?.data;
 
@@ -55,7 +60,7 @@ function OrderTrackingPage() {
         addressData: address || null,
     });
 
-    if (editMode && isLoadingAddress) {
+    if (editMode && isLoadingAddresses) {
         return (
             <div className="fixed inset-0 bg-gray-50 flex items-center justify-center">
                 <p className="text-sm2 text-disabled-text">در حال بارگذاری...</p>
@@ -63,8 +68,22 @@ function OrderTrackingPage() {
         );
     }
 
+    if (editMode && !address) {
+        return (
+            <div className="fixed inset-0 bg-gray-50 flex flex-col items-center justify-center gap-4 px-4">
+                <p className="text-sm2 text-disabled-text text-center">آدرس مورد نظر یافت نشد</p>
+                <button
+                    onClick={() => router.back()}
+                    className="p-2 rounded-full bg-container shadow-sm"
+                >
+                    <ArrowLeft size={24} className="stroke-foreground" />
+                </button>
+            </div>
+        );
+    }
+
     if (!restaurant) {
-        return null
+        return null;
     }
 
     return (
@@ -82,6 +101,7 @@ function OrderTrackingPage() {
                 <AddressDetailsModal
                     visible
                     selectedAddress={null}
+                    existingAddress={address}
                     formData={formData}
                     isPending={isPending}
                     editMode={editMode}
@@ -94,4 +114,4 @@ function OrderTrackingPage() {
     );
 }
 
-export default OrderTrackingPage;
\ No newline at end of file
+export default OrderTrackingPage;
diff --git a/src/app/[name]/(Profile)/profile/address/new/utils/formatAddress.ts b/src/app/[name]/(Profile)/profile/address/new/utils/formatAddress.ts
index 21597d2..5d0d2dd 100644
--- a/src/app/[name]/(Profile)/profile/address/new/utils/formatAddress.ts
+++ b/src/app/[name]/(Profile)/profile/address/new/utils/formatAddress.ts
@@ -1,4 +1,8 @@
-import { NominatimReverseGeocodingResponse } from '../../types/Types';
+import { Address, NominatimReverseGeocodingResponse } from '../../types/Types';
+
+export const formatAddress = (address: Address): string => {
+    return `${address.address}، ${address.city}، ${address.province}`;
+};
 
 export const formatSelectedAddress = (selectedAddress: NominatimReverseGeocodingResponse | null): string => {
     if (!selectedAddress) {
diff --git a/src/app/[name]/(Profile)/profile/address/page.tsx b/src/app/[name]/(Profile)/profile/address/page.tsx
index f360f93..939a200 100644
--- a/src/app/[name]/(Profile)/profile/address/page.tsx
+++ b/src/app/[name]/(Profile)/profile/address/page.tsx
@@ -72,6 +72,11 @@ function UserAddressesPage({ }: Props) {
         return `${address.address}، ${address.city}، ${address.province}`;
     };
 
+    const getEditHref = (addressId: string) => {
+        const base = `address/new?id=${addressId}`;
+        return redirect ? `${base}&redirect=${encodeURIComponent(redirect)}` : base;
+    };
+
     return (
         <div className='overflow-y-auto h-full noscrollbar flex flex-col'>
             <div className='grid grid-cols-3 items-center'>
@@ -134,7 +139,7 @@ function UserAddressesPage({ }: Props) {
                                     </Button>
                                 )}
                                 <div className="flex gap-2">
-                                    <Link href={`address/new?id=${address.id}`}>
+                                    <Link href={getEditHref(address.id)}>
                                         <Button className='bg-background! text-foreground! flex justify-center items-center gap-2 text-xs p-0! size-8!'>
                                             <Edit2 className='stroke-foreground size-5 mb-0.5' />
                                         </Button>