diff --git a/src/assets/locals/ar.json b/src/assets/locals/ar.json
index 1435f1c..a8c0238 100644
--- a/src/assets/locals/ar.json
+++ b/src/assets/locals/ar.json
@@ -376,5 +376,9 @@
     "save": "حفظ",
     "location": "العنوان",
     "pickupTime": "توقيت الاستلام"
+  },
+  "validation": {
+    "phoneRequired": "رقم الهاتف مطلوب",
+    "invalidPhone": "رقم الهاتف غير صالح"
   }
 }
diff --git a/src/assets/locals/en.json b/src/assets/locals/en.json
index 5d2c51a..82d1526 100644
--- a/src/assets/locals/en.json
+++ b/src/assets/locals/en.json
@@ -388,5 +388,9 @@
     "save": "save",
     "location": "Location",
     "pickupTime": "Pickup time"
+  },
+  "validation": {
+    "phoneRequired": "Phone number is required",
+    "invalidPhone": "Invalid phone number"
   }
 }
diff --git a/src/components/CustomBottomSheet/MapBottomSheet.tsx b/src/components/CustomBottomSheet/MapBottomSheet.tsx
index ba80776..ac7e09a 100644
--- a/src/components/CustomBottomSheet/MapBottomSheet.tsx
+++ b/src/components/CustomBottomSheet/MapBottomSheet.tsx
@@ -78,8 +78,8 @@ export function MapBottomSheet({
       title={t("cart.selectLocation")}
       showCloseButton={true}
       initialSnap={1}
-      height={"950px"}
-      snapPoints={["950px"]}
+      height={"755px"}
+      snapPoints={["755px"]}
     >
       <div
         style={{
diff --git a/src/pages/address/page.tsx b/src/pages/address/page.tsx
index d4752cc..7820e8f 100644
--- a/src/pages/address/page.tsx
+++ b/src/pages/address/page.tsx
@@ -12,6 +12,7 @@ import { useAppSelector } from "redux/hooks";
 import { colors, ProBlack2, ProGray1 } from "ThemeConstants";
 import { AddressSummary } from "../checkout/components/AddressSummary";
 import styles from "./address.module.css";
+import ProPhoneInput from "components/ProPhoneInput";
 
 export default function AddressPage() {
   const { t } = useTranslation();
@@ -120,19 +121,7 @@ export default function AddressPage() {
               />
             </Form.Item>
 
-            <Form.Item
-              label={t("address.mobileNumber")}
-              name="phone"
-              rules={[{ required: true, message: "" }]}
-            >
-              <Input
-                placeholder={t("address.mobileNumber")}
-                style={{
-                  fontSize: 14,
-                }}
-                autoFocus={false}
-              />
-            </Form.Item>
+            <ProPhoneInput label={t("address.mobileNumber")} propName="phone" />
 
             <Form.Item
               label={t("address.addressLabel")}
diff --git a/src/pages/cart/components/CartMobileTabletLayout.tsx b/src/pages/cart/components/CartMobileTabletLayout.tsx
index b9a02bf..ff16509 100644
--- a/src/pages/cart/components/CartMobileTabletLayout.tsx
+++ b/src/pages/cart/components/CartMobileTabletLayout.tsx
@@ -241,8 +241,7 @@ export default function CartMobileTabletLayout({
             orderType === OrderType.ScheduledOrder) && <CarPlateCard />}
 
           {/* Estimate Time */}
-          {(orderType === OrderType.Delivery ||
-            orderType === OrderType.Pickup ||
+          {(orderType === OrderType.Pickup ||
             orderType === OrderType.ScheduledOrder) && <TimeEstimateCard />}
 
           {/* Collection Method */}