From 1e4ade54f5dc3bc0a26661aecbfcace7600d29ae Mon Sep 17 00:00:00 2001
From: fakerdeft <whakswp123@naver.com>
Date: Mon, 27 Jul 2026 08:06:36 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EB=B0=8F=20=EC=A0=9C=EB=B3=B4=20=ED=9D=90=EB=A6=84?=
 =?UTF-8?q?=20=EC=95=88=EC=A0=95=ED=99=94=20-=20GPS=20=EC=9E=90=EB=8F=99?=
 =?UTF-8?q?=20=EA=B0=90=EC=A7=80=EB=A5=BC=20=EC=B5=9C=EC=B4=88=20=EC=A0=91?=
 =?UTF-8?q?=EC=86=8D=201=ED=9A=8C=EB=A1=9C=20=EC=A0=9C=ED=95=9C=ED=95=98?=
 =?UTF-8?q?=EA=B3=A0=20=EC=84=A0=ED=83=9D=ED=95=9C=20=EB=8F=99=EB=84=A4=20?=
 =?UTF-8?q?=EC=9C=A0=EC=A7=80=20-=20=ED=99=94=EB=A9=B4=20=EB=B3=B5?=
 =?UTF-8?q?=EA=B7=80=20=EC=8B=9C=20=ED=98=84=EC=9E=AC=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=EB=A5=BC=20=EB=8B=A4=EC=8B=9C=20=EA=B0=90=EC=A7=80=ED=95=98?=
 =?UTF-8?q?=EB=8D=98=20=EB=8F=99=EC=9E=91=20=EC=A0=9C=EA=B1=B0=20-=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EA=B0=90=EC=A7=80=20=EC=97=AC=EB=B6=80?=
 =?UTF-8?q?=EB=A5=BC=20=EB=A1=9C=EC=BB=AC=20=EC=A0=80=EC=9E=A5=EC=86=8C?=
 =?UTF-8?q?=EC=97=90=20=EC=98=81=EC=86=8D=ED=99=94=ED=95=98=EA=B3=A0=20?=
 =?UTF-8?q?=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20-=20=ED=99=88,=20=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC,=20=EC=A0=9C=EB=B3=B4=20=ED=99=94=EB=A9=B4?=
 =?UTF-8?q?=EC=9D=98=20=EC=9C=84=EC=B9=98=20=ED=83=90=EC=83=89=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EB=A5=BC=20=ED=9A=8C=EC=A0=84=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=EC=BD=98=EC=9C=BC=EB=A1=9C=20=ED=86=B5=EC=9D=BC=20-=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=AA=A8=EB=8B=AC=EA=B3=BC=20=EC=A0=9C?=
 =?UTF-8?q?=EB=B3=B4=20=EC=9C=84=EC=B9=98=20=EC=98=81=EC=97=AD=EC=9D=98=20?=
 =?UTF-8?q?=ED=81=AC=EA=B8=B0,=20=EB=AC=B8=EA=B5=AC=20=EB=B0=8F=20GPS=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0=20-=20=EC=9C=84=EC=B9=98=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EB=B9=88=20=EC=83=81=ED=83=9C=20=EB=AC=B8=EA=B5=AC=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=20=EC=97=86=EC=9D=8C?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=ED=86=B5=EC=9D=BC=20-=20=ED=99=88=20?=
 =?UTF-8?q?=EB=82=A0=EC=94=A8=20=ED=86=B5=EA=B3=84=EC=9D=98=20=EA=B0=95?=
 =?UTF-8?q?=EC=88=98=20=EB=AA=85=EC=B9=AD=EC=9D=84=20=EB=B9=84=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20-=20=EC=A0=9C=EB=B3=B4=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=EC=9D=B4=ED=83=88=20=EC=8B=9C=20=EC=9E=84=EC=8B=9C?=
 =?UTF-8?q?=20=EB=8B=A8=EA=B3=84=EB=A5=BC=20=EC=B4=88=EA=B8=B0=ED=99=94?=
 =?UTF-8?q?=ED=95=B4=202=EB=8B=A8=EA=B3=84=20=EC=9E=AC=EC=A7=84=EC=9E=85?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=A4=91=EB=B3=B5=20=EC=97=85=EB=A1=9C=EB=93=9C?=
 =?UTF-8?q?=20=EB=B0=A9=EC=A7=80=20-=20=EC=A0=9C=EB=B3=B4=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=ED=99=94=EB=A9=B4=EC=9D=98=20=EC=A0=9C=EB=AA=A9,?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=EC=B9=B4=EB=93=9C=20=EB=86=92=EC=9D=B4?=
 =?UTF-8?q?=EC=99=80=20=EC=84=B9=EC=85=98=20=EA=B0=84=EA=B2=A9=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=95=20-=20=EC=86=8C=EC=85=9C=20=EA=B3=84=EC=A0=95=20?=
 =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=99=84=EB=A3=8C=20=ED=9B=84=20=EA=B3=84?=
 =?UTF-8?q?=EC=A0=95=20=EC=A0=95=EB=B3=B4=20=ED=99=94=EB=A9=B4=EC=9D=84=20?=
 =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=97=B4=EC=96=B4=20=EC=97=B0=EB=8F=99=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=20=ED=99=95=EC=9D=B8=20=EC=A7=80=EC=9B=90=20?=
 =?UTF-8?q?-=20=EA=B3=84=EC=A0=95=20=EC=97=B0=EB=8F=99=20=EC=95=88?=
 =?UTF-8?q?=EB=82=B4=20=EB=AA=A8=EB=8B=AC=EC=9D=98=20=ED=85=8C=EB=91=90?=
 =?UTF-8?q?=EB=A6=AC=EC=99=80=20=EA=B7=B8=EB=A6=BC=EC=9E=90=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=A1=B0=EC=A0=95=20-=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95=20=EB=AA=A8=EB=8B=AC=EC=9D=98=20?=
 =?UTF-8?q?=EC=9E=90=EB=8F=99=20=ED=82=A4=EB=B3=B4=EB=93=9C=20=ED=98=B8?=
 =?UTF-8?q?=EC=B6=9C=20=EC=A0=9C=EA=B1=B0=20-=20=EB=AA=A8=EB=B0=94?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B7=B0=ED=8F=AC=ED=8A=B8=20=EB=86=92=EC=9D=B4?=
 =?UTF-8?q?=EB=A5=BC=20dvh=20=EA=B8=B0=EC=A4=80=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=B4=EC=99=84=20-=20=EB=B9=84=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=ED=95=98=EB=8B=A8=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0=20-=20README=EC=9D=98=20=EC=83=81=EB=8B=A8=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=AF=B8=EB=A6=AC?=
 =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                   |  7 +---
 app/globals.css                             |  4 +-
 components/auth-callback-screen.tsx         |  4 +-
 components/home-screen.tsx                  |  4 +-
 components/home-weather-controls.tsx        |  5 ++-
 components/location-detecting-indicator.tsx | 30 ++++++++++++++
 components/location-picker.tsx              | 15 +++----
 components/main-tab-navigation.tsx          |  4 +-
 components/my-page.tsx                      | 18 +++++++--
 components/name-edit-modal.tsx              |  1 -
 components/report-form.tsx                  | 43 +++++++++++++++------
 components/user-panel.tsx                   | 14 ++++++-
 components/weather-summary.tsx              |  2 +-
 hooks/use-current-location.ts               | 38 +++---------------
 lib/account-panel-return.ts                 | 19 +++++++++
 store/location-store.ts                     | 30 ++++++++------
 16 files changed, 157 insertions(+), 81 deletions(-)
 create mode 100644 components/location-detecting-indicator.tsx
 create mode 100644 lib/account-panel-return.ts

diff --git a/README.md b/README.md
index ec09dd6..1a646bd 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 <div align="center">
-  <img src="./public/avatars/sun.svg" width="88" alt="날씨로그" />
   <h1>날씨로그</h1>
   <p>
     예보보다 가까운, 이웃이 직접 전하는 지금 날씨
@@ -14,11 +13,7 @@
 날씨로그는 같은 동네의 이웃들이 직접 느낀 날씨를 사진과 함께 공유하는 모바일 웹 서비스입니다.
 숫자로 표시된 예보만으로 알기 어려운 체감온도, 비, 햇빛 상태를 최근 제보로 빠르게 확인할 수 있습니다.
 
-## 서비스 미리보기
-
-<p align="center">
-  <img src="./public/weather/clear-sky.webp" alt="맑은 하늘 제보" />
-</p>
+## 핵심 기능
 
 ### 동네 날씨 피드
 
diff --git a/app/globals.css b/app/globals.css
index 4c1eb7e..fb6ce04 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -16,6 +16,7 @@ html { background: #deeff8; }
 body {
   margin: 0;
   min-height: 100vh;
+  min-height: 100dvh;
   color: var(--ink);
   background: linear-gradient(145deg, #deeff8 0%, #f4fbff 50%, #ddecf5 100%);
   font-family: "Pretendard Variable", Pretendard, "Apple SD Gothic Neo", "Noto Sans KR", sans-serif;
@@ -27,12 +28,13 @@ button { cursor: pointer; }
   position: relative;
   width: min(100%, 480px);
   min-height: 100vh;
+  min-height: 100dvh;
   margin: 0 auto;
   overflow-x: clip;
   background: #eef9ff;
   box-shadow: 0 0 48px rgba(48, 98, 126, .12);
 }
-.page { min-height: 100vh; padding: 0 20px 112px; }
+.page { min-height: 100vh; min-height: 100dvh; padding: 0 20px 112px; }
 .main-tab-page { padding-bottom: 80px; }
 .safe-top { padding-top: max(8px, env(safe-area-inset-top)); }
 .home-header-top { padding-top: max(9px, env(safe-area-inset-top)); }
diff --git a/components/auth-callback-screen.tsx b/components/auth-callback-screen.tsx
index 82ff26b..881b0bb 100644
--- a/components/auth-callback-screen.tsx
+++ b/components/auth-callback-screen.tsx
@@ -6,6 +6,7 @@ import { useRouter, useSearchParams } from "next/navigation";
 import { useEffect, useRef, useState } from "react";
 import { SocialIcon } from "@/components/social-icon";
 import { authApi, type OAuthCallbackResult } from "@/lib/api/auth-api";
+import { markAccountPanelReturn } from "@/lib/account-panel-return";
 import { resolveApiUrl } from "@/lib/api/config";
 import { logger } from "@/lib/logging";
 import type { SocialProvider } from "@/lib/types";
@@ -55,6 +56,7 @@ export function AuthCallbackScreen() {
         const code = searchParams.get("code");
         if (result === "LINK_SUCCESS") {
           authLogger.info("authentication_completed", { result });
+          markAccountPanelReturn();
           showToast("소셜 계정을 연동했어요.", "SUCCESS");
           router.replace("/mypage");
           return;
@@ -128,7 +130,7 @@ export function AuthCallbackScreen() {
 
   return (
     <main className="flex min-h-[75dvh] items-center justify-center px-5">
-      <section className="w-full max-w-[340px] rounded-[24px] bg-[#eef9ff] p-5 shadow-xl">
+      <section className="w-full max-w-[340px] rounded-[24px] border-2 border-[#d2e3ec] bg-[#eef9ff] p-5">
         <h1 className="text-center text-xl font-extrabold">계정 연동</h1>
         <div className="mt-4 rounded-[20px] border-2 border-[#d2e3ec] px-4 py-5 text-center">
           <div className="mx-auto w-fit"><SocialIcon provider={pendingLink.provider} /></div>
diff --git a/components/home-screen.tsx b/components/home-screen.tsx
index fc0cd73..3e71241 100644
--- a/components/home-screen.tsx
+++ b/components/home-screen.tsx
@@ -17,7 +17,7 @@ import { getLocationName } from "@/lib/constants";
 import { useToastStore } from "@/store/toast-store";
 
 export function HomeScreen() {
-  const { location, setLocation, isDetecting, detectionError, needsManualInput, setNeedsManualInput, detectLocation } = useCurrentLocation({ refreshOnResume: true });
+  const { location, setLocation, isDetecting, detectionError, needsManualInput, setNeedsManualInput, detectLocation } = useCurrentLocation();
   const showToast = useToastStore((state) => state.showToast);
   const loadMoreRef = useRef<HTMLDivElement>(null);
   const locationLabel = location ? getLocationName(location, "short") : "";
@@ -55,7 +55,7 @@ export function HomeScreen() {
   const hasWeatherData = hasSummaryData || hasReportData;
   const hasWeatherError = summary.isError || reports.isError;
   const showLocationError = !location && !isDetecting && Boolean(detectionError);
-  const isInitialWeatherLoading = !locationLabel || (!hasWeatherData && (summary.isPending || reports.isPending));
+  const isInitialWeatherLoading = !isDetecting && Boolean(locationLabel) && !hasWeatherData && (summary.isPending || reports.isPending);
   const showFullWeatherError = Boolean(locationLabel) && !hasWeatherData && hasWeatherError && !summary.isPending && !reports.isPending;
   return (
     <div className="page main-tab-page">
diff --git a/components/home-weather-controls.tsx b/components/home-weather-controls.tsx
index f808132..78e2998 100644
--- a/components/home-weather-controls.tsx
+++ b/components/home-weather-controls.tsx
@@ -2,6 +2,7 @@ import { format } from "date-fns";
 import { ko } from "date-fns/locale";
 import { ChevronDown, MapPin, RotateCw } from "lucide-react";
 import { useSyncExternalStore } from "react";
+import { LocationDetectingIndicator } from "@/components/location-detecting-indicator";
 
 let openedAt = 0;
 const openedAtListeners = new Set<() => void>();
@@ -42,11 +43,11 @@ export function HomeWeatherControls({
     : "현재 시각";
 
   return (
-    <section className="mb-2 flex items-center justify-between gap-2">
+    <section className="mb-1 flex items-center justify-between gap-2">
       <button type="button" onClick={onLocationClick} className="group flex w-fit min-w-0 max-w-[60%] items-center gap-2 py-2.5 pr-1 text-left">
         <MapPin size={18} className="shrink-0 text-[#45ace4]" />
         {isDetecting
-          ? <span className="skeleton h-4 w-28 max-w-full rounded" aria-label="현재 위치 불러오는 중" />
+          ? <LocationDetectingIndicator compact />
           : <span className="min-w-0 truncate text-base font-extrabold">{location || "동네를 선택해 주세요"}</span>}
         <ChevronDown size={16} className="shrink-0 text-[#8ba0ae] transition-transform group-hover:translate-y-0.5" />
       </button>
diff --git a/components/location-detecting-indicator.tsx b/components/location-detecting-indicator.tsx
new file mode 100644
index 0000000..0f516f8
--- /dev/null
+++ b/components/location-detecting-indicator.tsx
@@ -0,0 +1,30 @@
+import { LoaderCircle } from "lucide-react";
+
+export function LocationDetectingIndicator({
+  className = "",
+  compact = false,
+  iconPosition = "left",
+}: {
+  className?: string;
+  compact?: boolean;
+  iconPosition?: "left" | "right";
+}) {
+  const spinner = (
+    <LoaderCircle
+      size={compact ? 14 : 16}
+      className="shrink-0 animate-spin text-[#45ace4]"
+    />
+  );
+
+  return (
+    <span
+      role="status"
+      aria-live="polite"
+      className={`inline-flex min-w-0 items-center gap-1.5 text-[#718594] ${compact ? "text-xs font-bold" : "text-base font-extrabold"} ${className}`}
+    >
+      {iconPosition === "left" && spinner}
+      <span className="truncate">위치를 찾는 중</span>
+      {iconPosition === "right" && spinner}
+    </span>
+  );
+}
diff --git a/components/location-picker.tsx b/components/location-picker.tsx
index 22f8887..3045b23 100644
--- a/components/location-picker.tsx
+++ b/components/location-picker.tsx
@@ -4,6 +4,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { AlertCircle, Check, Flame, LockKeyhole, LocateFixed, MapPin, RefreshCw, Search, Star, X } from "lucide-react";
 import { FormEvent, useEffect, useState, type ReactNode } from "react";
 import { createPortal } from "react-dom";
+import { LocationDetectingIndicator } from "@/components/location-detecting-indicator";
 import { getLocationName } from "@/lib/constants";
 import { locationApi } from "@/lib/api/location-api";
 import { truncateText } from "@/lib/text";
@@ -106,14 +107,14 @@ function LocationPickerDialog({ current, isDetecting, detectionError, required,
           </div>
           {!required && <button type="button" onClick={onClose} className="flex size-9 items-center justify-center rounded-xl border-2 border-[#d2e3ec]" aria-label="닫기"><X size={18} /></button>}
         </div>
-        <div className="mb-5 flex items-center gap-3 rounded-[18px] border-2 border-[#d2e3ec] p-4">
-          <span className="flex size-10 shrink-0 items-center justify-center rounded-xl bg-[#eef9ff] text-[#45ace4]"><MapPin size={19} /></span>
-          <div className="min-w-0 flex-1"><p className="text-[11px] font-bold text-[#718594]">현재 설정된 위치</p>{isDetecting ? <div className="skeleton mt-1.5 h-4 w-44 max-w-full rounded" aria-label="현재 위치 불러오는 중" /> : <p className="mt-0.5 break-keep text-sm font-extrabold leading-5">{selectedLocation ? getLocationName(selectedLocation, "full") : current ? getLocationName(current, "full") : "아직 설정되지 않았어요"}</p>}</div>
-          <button type="button" onClick={detectCandidateLocation} disabled={isDetecting} className="flex shrink-0 items-center gap-1 rounded-xl bg-[#eef9ff] px-2.5 py-2 text-[11px] font-extrabold text-[#268fc7] disabled:opacity-50" aria-label="GPS로 현재 위치 다시 찾기"><LocateFixed size={14} /> GPS</button>
+        <div className="mb-5 flex items-center gap-3 rounded-[18px] border-2 border-[#d2e3ec] p-3">
+          <span className="flex size-9 shrink-0 items-center justify-center rounded-xl bg-[#eef9ff] text-[#45ace4]"><MapPin size={18} /></span>
+          <div className="min-w-0 flex-1">{isDetecting ? <LocationDetectingIndicator iconPosition="right" /> : <p className="break-keep text-base font-extrabold leading-6">{selectedLocation ? getLocationName(selectedLocation, "full") : current ? getLocationName(current, "full") : "아직 설정되지 않았어요"}</p>}</div>
+          <button type="button" onClick={detectCandidateLocation} disabled={isDetecting} className="flex shrink-0 items-center gap-1 rounded-xl border-2 border-[#d2e3ec] bg-[#eef9ff] px-2.5 py-1.5 text-[11px] font-extrabold text-[#268fc7] disabled:opacity-50" aria-label="GPS로 현재 위치 다시 찾기"><LocateFixed size={14} /> GPS</button>
         </div>
         {detectionError && <p className="-mt-3 mb-5 flex items-start gap-1.5 px-1 text-xs font-bold leading-5 text-[#b36b54]"><AlertCircle size={14} className="mt-0.5 shrink-0" />{detectionError}</p>}
         <form onSubmit={submit}>
-          <div className="mb-4 grid grid-cols-3 rounded-2xl bg-[#f1f6f9] p-1">
+          <div className="mb-4 grid grid-cols-3 rounded-2xl p-1">
             <TabButton active={activeTab === "SEARCH"} onClick={() => setActiveTab("SEARCH")} icon={<Search size={14} />} label="검색" />
             <TabButton active={activeTab === "FAVORITES"} onClick={() => setActiveTab("FAVORITES")} icon={<Star size={14} />} label="즐겨찾기" />
             <TabButton active={activeTab === "POPULAR"} onClick={() => setActiveTab("POPULAR")} icon={<Flame size={14} />} label="인기" />
@@ -130,8 +131,8 @@ function LocationPickerDialog({ current, isDetecting, detectionError, required,
                 {!serverSearch.isError && searchResults.map((location) => <LocationRow key={location.id} location={location} selected={selectedLocation?.id === location.id} favorite={isMember ? isFavorite(location) : undefined} onSelect={chooseLocation} onToggleFavorite={isMember ? toggleFavorite : undefined} />)}
                 {serverSearch.isFetching && <div className="space-y-2 px-3 py-3">{Array.from({ length: 3 }).map((_, index) => <div key={index} className="skeleton h-10 rounded-xl" />)}</div>}
                 {serverSearch.isError && <LocationLoadError onRetry={() => serverSearch.refetch()} />}
-                {value.trim() && !serverSearch.isFetching && !serverSearch.isError && searchResults.length === 0 && <p className="px-3 py-8 text-center text-sm font-semibold text-[#8ba0ae]">지원하는 지역을 찾지 못했어요.</p>}
-                {!value.trim() && <p className="px-3 py-8 text-center text-sm font-semibold leading-6 text-[#8ba0ae]">찾고 싶은 시·구 또는 동 이름을 입력해 주세요.</p>}
+                {value.trim() && !serverSearch.isFetching && !serverSearch.isError && searchResults.length === 0 && <p className="px-3 py-8 text-center text-sm font-semibold text-[#8ba0ae]">검색 결과가 없습니다.</p>}
+                {!value.trim() && <p className="px-3 py-8 text-center text-sm font-semibold leading-6 text-[#8ba0ae]">검색 결과가 없습니다.</p>}
               </div>
             </>}
             {activeTab === "FAVORITES" && (isMember
diff --git a/components/main-tab-navigation.tsx b/components/main-tab-navigation.tsx
index a766359..30f6b6e 100644
--- a/components/main-tab-navigation.tsx
+++ b/components/main-tab-navigation.tsx
@@ -43,7 +43,9 @@ export function MainTabNavigation() {
   const profileActive = pathname === "/mypage";
   const profileContent = (
     <span
-      className="flex size-8 items-center justify-center rounded-full bg-white bg-cover bg-center"
+      className={`flex size-8 items-center justify-center rounded-full bg-cover bg-center ${
+        user.type === "MEMBER" ? "" : "border-2 border-[#b9dceb] bg-transparent"
+      }`}
       style={user.type === "MEMBER" && user.avatarUrl ? { backgroundImage: `url(${user.avatarUrl})` } : undefined}
       aria-hidden="true"
     >
diff --git a/components/my-page.tsx b/components/my-page.tsx
index 2f5ec52..379b1a2 100644
--- a/components/my-page.tsx
+++ b/components/my-page.tsx
@@ -8,7 +8,8 @@ import { MyReportList } from "@/components/my-report-list";
 import { NicknameEditModal } from "@/components/nickname-edit-modal";
 import { ProfileImageModal, type ProfileImageSelection } from "@/components/profile-image-modal";
 import { ProfilePreviewModal } from "@/components/profile-preview-modal";
-import { UserPanel } from "@/components/user-panel";
+import { UserPanel, type UserPanelView } from "@/components/user-panel";
+import { consumeAccountPanelReturn } from "@/lib/account-panel-return";
 import { memberApi } from "@/lib/api/member-api";
 import { resolveProfileImage } from "@/lib/constants";
 import { optimizeAvatarImage } from "@/lib/image";
@@ -24,6 +25,7 @@ export function MyPage() {
   const setNickname = useAuthStore((state) => state.setNickname);
   const showToast = useToastStore((state) => state.showToast);
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
+  const [userPanelInitialView, setUserPanelInitialView] = useState<UserPanelView>("MAIN");
   const [isProfileImageOpen, setIsProfileImageOpen] = useState(false);
   const [isProfilePreviewOpen, setIsProfilePreviewOpen] = useState(false);
   const [isNicknameOpen, setIsNicknameOpen] = useState(false);
@@ -76,6 +78,16 @@ export function MyPage() {
     if (hasCheckedServerSession && user.type !== "MEMBER") router.replace("/");
   }, [hasCheckedServerSession, router, user.type]);
 
+  useEffect(() => {
+    if (!hasCheckedServerSession || user.type !== "MEMBER") return;
+    const timeout = window.setTimeout(() => {
+      if (!consumeAccountPanelReturn()) return;
+      setUserPanelInitialView("ACCOUNT");
+      setIsSettingsOpen(true);
+    }, 0);
+    return () => window.clearTimeout(timeout);
+  }, [hasCheckedServerSession, user.type]);
+
   if (!hasCheckedServerSession) {
     return <main className="min-h-[75dvh] pb-[72px]" aria-busy="true"><header className="safe-top spacious-page-header grid grid-cols-[36px_1fr_36px] items-center px-5 pb-2"><span /><div className="skeleton mx-auto h-5 w-20 rounded" /><span /></header><section className="flex items-center gap-5 px-5 pb-6 pt-0"><div className="skeleton size-18 rounded-full" /><div className="skeleton h-4 w-28 rounded" /></section><section className="px-5"><div className="skeleton mb-3 h-11 rounded" /><div className="grid grid-cols-3 gap-1.5">{Array.from({ length: 6 }).map((_, index) => <div key={index} className="skeleton aspect-square rounded-lg" />)}</div></section></main>;
   }
@@ -89,7 +101,7 @@ export function MyPage() {
       <header className="safe-top spacious-page-header sticky top-0 z-30 grid grid-cols-[36px_1fr_36px] items-center bg-[#eef9ff] px-5 pb-2">
         <span aria-hidden="true" />
         <h1 className="text-center text-lg font-extrabold">프로필</h1>
-        <button type="button" onClick={() => setIsSettingsOpen(true)} className="header-action-button justify-self-end" aria-label="설정 열기"><Settings size={18} /></button>
+        <button type="button" onClick={() => { setUserPanelInitialView("MAIN"); setIsSettingsOpen(true); }} className="header-action-button justify-self-end" aria-label="설정 열기"><Settings size={18} /></button>
       </header>
 
       <section className="px-5 pb-5 pt-0">
@@ -112,7 +124,7 @@ export function MyPage() {
         <MyReportList memberId={user.id} columns={3} />
       </section>
 
-      <UserPanel open={isSettingsOpen} onClose={() => setIsSettingsOpen(false)} />
+      {isSettingsOpen && <UserPanel open initialView={userPanelInitialView} onClose={() => { setIsSettingsOpen(false); setUserPanelInitialView("MAIN"); }} />}
       {isProfileImageOpen && <ProfileImageModal current={avatarUrl} onClose={() => setIsProfileImageOpen(false)} onChange={saveProfileImage} />}
       {isProfilePreviewOpen && <ProfilePreviewModal avatarUrl={avatarUrl} onClose={() => setIsProfilePreviewOpen(false)} />}
       {isNicknameOpen && <NicknameEditModal currentNickname={nickname} onClose={() => setIsNicknameOpen(false)} onSave={saveNickname} />}
diff --git a/components/name-edit-modal.tsx b/components/name-edit-modal.tsx
index cf5cb06..c3cb70e 100644
--- a/components/name-edit-modal.tsx
+++ b/components/name-edit-modal.tsx
@@ -47,7 +47,6 @@ export function NameEditModal({
             id="member-name"
             value={name}
             maxLength={30}
-            autoFocus
             autoComplete="name"
             onChange={(event) => {
               const nextName = event.currentTarget.value;
diff --git a/components/report-form.tsx b/components/report-form.tsx
index fc09dbb..17b0c4c 100644
--- a/components/report-form.tsx
+++ b/components/report-form.tsx
@@ -6,8 +6,10 @@ import { ArrowLeft, ChevronRight, ImagePlus, LoaderCircle, MapPin, X } from "luc
 import Image from "next/image";
 import { useRouter } from "next/navigation";
 import { ChangeEvent, FormEvent, useEffect, useMemo, useRef, useState } from "react";
+import { flushSync } from "react-dom";
 import { useForm, useWatch } from "react-hook-form";
 import { z } from "zod";
+import { LocationDetectingIndicator } from "@/components/location-detecting-indicator";
 import { LocationPicker } from "@/components/location-picker";
 import { PhotoSourceSheet } from "@/components/photo-source-sheet";
 import { useCurrentLocation } from "@/hooks/use-current-location";
@@ -33,7 +35,6 @@ const schema = z.object({
 type ReportFormValues = z.infer<typeof schema>;
 const reportDraftSchema = z.object({
   updatedAt: z.number(),
-  step: z.union([z.literal(1), z.literal(2)]),
   selectedReportLocation: z.object({
     id: z.string().optional(),
     label: z.string(),
@@ -84,12 +85,12 @@ interface StatusOption<T extends string> { value: T; label: string }
 
 function StatusField<T extends string>({ title, options, value, onChange }: { title: string; options: ReadonlyArray<StatusOption<T>>; value?: T; onChange: (value?: T) => void }) {
   return (
-    <fieldset className="mt-8">
+    <fieldset className="mt-6">
       <legend className="text-[17px] font-extrabold">{title} <span className="text-[#45ace4]">*</span></legend>
       <div className="mt-3 grid grid-cols-3 gap-2">
         {options.map((option) => {
           const selected = value === option.value;
-          return <button key={option.value} type="button" onClick={() => onChange(selected ? undefined : option.value)} className={`flex min-h-16 items-center justify-center rounded-[18px] border-2 p-2 transition ${selected ? "border-[#45ace4] bg-[#eaf7ff] text-[#268fc7] ring-2 ring-[#45ace4]/10" : "border-[#d2e3ec] text-[#526a7a]"}`} aria-pressed={selected}>
+          return <button key={option.value} type="button" onClick={() => onChange(selected ? undefined : option.value)} className={`flex min-h-14 items-center justify-center rounded-[18px] border-2 p-2 transition ${selected ? "border-[#45ace4] bg-[#eaf7ff] text-[#268fc7] ring-2 ring-[#45ace4]/10" : "border-[#d2e3ec] text-[#526a7a]"}`} aria-pressed={selected}>
             <span className="text-[13px] font-bold">{option.label}</span>
           </button>;
         })}
@@ -135,7 +136,6 @@ export function ReportForm() {
     const timeout = window.setTimeout(() => {
       const draft = readReportDraft();
       if (draft) {
-        setStep(draft.step);
         setSelectedReportLocation(draft.selectedReportLocation);
         reset({
           content: draft.content,
@@ -157,7 +157,6 @@ export function ReportForm() {
     const timeout = window.setTimeout(() => {
       writeReportDraft({
         updatedAt: Date.now(),
-        step,
         selectedReportLocation,
         content,
         temperature,
@@ -167,7 +166,7 @@ export function ReportForm() {
       });
     }, 150);
     return () => window.clearTimeout(timeout);
-  }, [content, files.length, isDraftReady, precipitation, selectedReportLocation, step, sunlight, temperature]);
+  }, [content, files.length, isDraftReady, precipitation, selectedReportLocation, sunlight, temperature]);
   useEffect(() => {
     const closePhotoSource = () => setIsPhotoSourceOpen(false);
     const closePhotoSourceWhenVisible = () => {
@@ -210,6 +209,28 @@ export function ReportForm() {
     },
   });
 
+  useEffect(() => {
+    const discardDraftBeforeHistoryExit = () => {
+      if (mutation.isPending) return;
+      clearReportDraft();
+      flushSync(() => {
+        setStep(1);
+        setSelectedReportLocation(null);
+        reset({ content: "", images: [] });
+      });
+    };
+    const resetStepAfterPageRestore = (event: PageTransitionEvent) => {
+      if (event.persisted && !mutation.isPending) setStep(1);
+    };
+
+    window.addEventListener("popstate", discardDraftBeforeHistoryExit);
+    window.addEventListener("pageshow", resetStepAfterPageRestore);
+    return () => {
+      window.removeEventListener("popstate", discardDraftBeforeHistoryExit);
+      window.removeEventListener("pageshow", resetStepAfterPageRestore);
+    };
+  }, [mutation.isPending, reset]);
+
   useEffect(() => {
     if (!mutation.isPending) return;
 
@@ -293,7 +314,7 @@ export function ReportForm() {
       <header className="safe-top pb-2">
         <div className="flex min-h-9 items-center justify-between">
           <button type="button" disabled={mutation.isPending} onClick={() => step === 2 ? setStep(1) : router.back()} className="header-back-button disabled:cursor-not-allowed disabled:opacity-50" aria-label={step === 2 ? "이전 단계" : "뒤로 가기"}><ArrowLeft size={18} /></button>
-          <h1 className="text-lg font-extrabold">지금 날씨 제보하기</h1>
+          <h1 className="text-lg font-extrabold">날씨 제보하기</h1>
           <span className="w-9" />
         </div>
         <div className="mt-3 flex items-center justify-center" aria-label={`2페이지 중 ${step}페이지`}>
@@ -307,12 +328,12 @@ export function ReportForm() {
         <input type="hidden" {...register("temperature")} />
         <input type="hidden" {...register("precipitation")} />
         <input type="hidden" {...register("sunlight")} />
-        <button type="button" onClick={() => setNeedsManualInput(true)} className="flex w-full items-center gap-3 rounded-[20px] border-2 border-[#d2e3ec] p-4 text-left">
-          <span className="flex size-10 shrink-0 items-center justify-center rounded-xl bg-[#eef9ff] text-[#45ace4]"><MapPin size={20} /></span>
-          <span className="min-w-0 flex-1"><span className="block text-xs font-semibold text-[#718594]">현재 위치</span>{isDetecting && !needsManualInput ? <span className="skeleton mt-1 block h-4 w-40 max-w-full rounded" aria-label="현재 위치 불러오는 중" /> : <span className="block truncate font-extrabold">{reportLocation?.label ?? "위치를 설정해 주세요"}</span>}</span>
+        <button type="button" onClick={() => setNeedsManualInput(true)} className="flex w-full items-center gap-3 rounded-[20px] border-2 border-[#d2e3ec] p-3 text-left">
+          <span className="flex size-9 shrink-0 items-center justify-center rounded-xl bg-[#eef9ff] text-[#45ace4]"><MapPin size={18} /></span>
+          <span className="min-w-0 flex-1">{isDetecting && !needsManualInput ? <LocationDetectingIndicator iconPosition="right" /> : <span className="block truncate text-base font-extrabold">{reportLocation?.label ?? "위치를 설정해 주세요"}</span>}</span>
         </button>
 
-        <section className="mt-8">
+        <section className="mt-5">
           <h2 className="text-[17px] font-extrabold">사진 <span className="align-middle text-[11px] font-semibold text-[#8ba0ae]">최대 3장</span></h2>
           <div className="mt-3 grid grid-cols-3 gap-2.5">
             {Array.from({ length: 3 }).map((_, index) => {
diff --git a/components/user-panel.tsx b/components/user-panel.tsx
index e333298..ee75685 100644
--- a/components/user-panel.tsx
+++ b/components/user-panel.tsx
@@ -40,14 +40,24 @@ const providerLabel: Record<SocialProvider, string> = {
 
 const socialProviders: SocialProvider[] = ["NAVER", "KAKAO"];
 
-export function UserPanel({ open, onClose }: { open: boolean; onClose: () => void }) {
+export type UserPanelView = "MAIN" | "ACCOUNT" | "FEEDBACK";
+
+export function UserPanel({
+  open,
+  onClose,
+  initialView = "MAIN",
+}: {
+  open: boolean;
+  onClose: () => void;
+  initialView?: UserPanelView;
+}) {
   const router = useRouter();
   const queryClient = useQueryClient();
   const user = useAuthStore((state) => state.user);
   const clearUser = useAuthStore((state) => state.logout);
   const showToast = useToastStore((state) => state.showToast);
   const openLegalDocument = useLegalModalStore((state) => state.openLegalDocument);
-  const [view, setView] = useState<"MAIN" | "ACCOUNT" | "FEEDBACK">("MAIN");
+  const [view, setView] = useState<UserPanelView>(initialView);
   const [isWithdrawalOpen, setIsWithdrawalOpen] = useState(false);
   const [isNameEditOpen, setIsNameEditOpen] = useState(false);
   const [isWithdrawing, setIsWithdrawing] = useState(false);
diff --git a/components/weather-summary.tsx b/components/weather-summary.tsx
index e8a43df..48d4304 100644
--- a/components/weather-summary.tsx
+++ b/components/weather-summary.tsx
@@ -11,7 +11,7 @@ export function WeatherSummary({ summary }: { summary: Summary }) {
     <section className="mb-3">
       <div className="grid grid-cols-3 gap-2">
         <SummaryItem icon={<Thermometer size={17} />} label="체감온도" value={temperature ? statusLabel(TEMPERATURE_OPTIONS, temperature) : "제보 없음"} tone={temperature ? temperatureTone[temperature] : emptyTone} />
-        <SummaryItem icon={<CloudRain size={17} />} label="강수" value={precipitation ? statusLabel(PRECIPITATION_OPTIONS, precipitation) : "제보 없음"} tone={precipitation ? precipitationTone[precipitation] : emptyTone} />
+        <SummaryItem icon={<CloudRain size={17} />} label="비" value={precipitation ? statusLabel(PRECIPITATION_OPTIONS, precipitation) : "제보 없음"} tone={precipitation ? precipitationTone[precipitation] : emptyTone} />
         <SummaryItem icon={<Sun size={17} />} label="햇빛" value={sunlight ? statusLabel(SUNLIGHT_OPTIONS, sunlight) : "제보 없음"} tone={sunlight ? sunlightTone[sunlight] : emptyTone} />
       </div>
     </section>
diff --git a/hooks/use-current-location.ts b/hooks/use-current-location.ts
index 83b6fc7..5c0605f 100644
--- a/hooks/use-current-location.ts
+++ b/hooks/use-current-location.ts
@@ -10,13 +10,12 @@ import { useLocationStore } from "@/store/location-store";
 const locationLogger = logger.child("location.detection");
 const refreshedLocationIds = new Set<string>();
 
-export function useCurrentLocation({ refreshOnResume = false }: { refreshOnResume?: boolean } = {}) {
+export function useCurrentLocation() {
   const { location, setLocation, hasAttemptedDetection, markDetectionAttempted } = useLocationStore();
   const [isDetecting, setIsDetecting] = useState(false);
   const [needsManualInput, setNeedsManualInputState] = useState(false);
   const [detectionError, setDetectionError] = useState("");
   const detectionPromiseRef = useRef<Promise<Location | null> | null>(null);
-  const lastAutomaticDetectionAtRef = useRef(0);
   const manualInputDismissedRef = useRef(false);
 
   const setNeedsManualInput = useCallback((next: boolean) => {
@@ -87,42 +86,17 @@ export function useCurrentLocation({ refreshOnResume = false }: { refreshOnResum
   }, [markDetectionAttempted, requestManualInput, setLocation]);
 
   useEffect(() => {
-    if (hasAttemptedDetection) return;
+    if (hasAttemptedDetection || location) return;
     const timeout = window.setTimeout(() => {
-      lastAutomaticDetectionAtRef.current = Date.now();
       void detectLocation(true);
     }, 0);
     return () => window.clearTimeout(timeout);
-  }, [detectLocation, hasAttemptedDetection]);
+  }, [detectLocation, hasAttemptedDetection, location]);
 
   useEffect(() => {
-    if (!refreshOnResume) return;
-    let hiddenAt: number | null = null;
-    const refreshCurrentLocation = () => {
-      const now = Date.now();
-      if (now - lastAutomaticDetectionAtRef.current < 30_000) return;
-      lastAutomaticDetectionAtRef.current = now;
-      void detectLocation(true);
-    };
-    const handlePageShow = (event: PageTransitionEvent) => {
-      if (event.persisted) refreshCurrentLocation();
-    };
-    const handleVisibilityChange = () => {
-      if (document.visibilityState === "hidden") {
-        hiddenAt = Date.now();
-        return;
-      }
-      if (hiddenAt && Date.now() - hiddenAt >= 30_000) refreshCurrentLocation();
-      hiddenAt = null;
-    };
-
-    window.addEventListener("pageshow", handlePageShow);
-    document.addEventListener("visibilitychange", handleVisibilityChange);
-    return () => {
-      window.removeEventListener("pageshow", handlePageShow);
-      document.removeEventListener("visibilitychange", handleVisibilityChange);
-    };
-  }, [detectLocation, refreshOnResume]);
+    if (location || !hasAttemptedDetection || isDetecting) return;
+    requestManualInput();
+  }, [hasAttemptedDetection, isDetecting, location, requestManualInput]);
 
   useEffect(() => {
     const locationId = location?.id;
diff --git a/lib/account-panel-return.ts b/lib/account-panel-return.ts
new file mode 100644
index 0000000..99f2287
--- /dev/null
+++ b/lib/account-panel-return.ts
@@ -0,0 +1,19 @@
+const ACCOUNT_PANEL_RETURN_KEY = "nalssilog-open-account-panel";
+
+export function markAccountPanelReturn() {
+  try {
+    window.sessionStorage.setItem(ACCOUNT_PANEL_RETURN_KEY, "1");
+  } catch {
+    // 저장소가 차단된 환경에서는 프로필 화면으로만 복귀한다.
+  }
+}
+
+export function consumeAccountPanelReturn() {
+  try {
+    const shouldOpen = window.sessionStorage.getItem(ACCOUNT_PANEL_RETURN_KEY) === "1";
+    window.sessionStorage.removeItem(ACCOUNT_PANEL_RETURN_KEY);
+    return shouldOpen;
+  } catch {
+    return false;
+  }
+}
diff --git a/store/location-store.ts b/store/location-store.ts
index adf33f9..1be75da 100644
--- a/store/location-store.ts
+++ b/store/location-store.ts
@@ -22,31 +22,39 @@ export const useLocationStore = create<LocationState>()(
     }),
     {
       name: "nalssilog-location",
-      version: 2,
+      version: 3,
       migrate: (persistedState) => {
-        const state = persistedState as LocationState;
-        if (state.location?.label === "송파구 잠실동") {
+        const state = persistedState as Partial<LocationState>;
+        const storedLocation = state.location ?? null;
+        const hasAttemptedDetection = state.hasAttemptedDetection ?? Boolean(storedLocation);
+        if (storedLocation?.label === "송파구 잠실동") {
           return {
-            ...state,
             location: null,
+            hasAttemptedDetection,
           };
         }
-        if (state.location) {
-          const supportedLocation = findSupportedLocation(state.location);
+        if (storedLocation) {
+          const supportedLocation = findSupportedLocation(storedLocation);
           if (supportedLocation) {
             return {
-              ...state,
               location: {
                 ...supportedLocation,
-                latitude: state.location.latitude,
-                longitude: state.location.longitude,
+                latitude: storedLocation.latitude,
+                longitude: storedLocation.longitude,
               },
+              hasAttemptedDetection,
             };
           }
         }
-        return state;
+        return {
+          location: storedLocation,
+          hasAttemptedDetection,
+        };
       },
-      partialize: (state) => ({ location: state.location }),
+      partialize: (state) => ({
+        location: state.location,
+        hasAttemptedDetection: state.hasAttemptedDetection,
+      }),
     },
   ),
 );