From 31f2f8eec0fc3c4973b65e950ed166ca973170fb Mon Sep 17 00:00:00 2001
From: dwebxr <info@cipher-web.com>
Date: Thu, 24 Sep 2026 22:23:23 +0900
Subject: [PATCH] =?UTF-8?q?fix(qr):=20QR=20modal=20=E3=81=8C=E8=A6=AA?=
 =?UTF-8?q?=E3=81=AE=E5=86=8D=E6=8F=8F=E7=94=BB=E3=81=94=E3=81=A8=E3=81=AB?=
 =?UTF-8?q?=20focus=20=E3=82=92=E5=A5=AA=E3=81=86=E3=83=BB=E9=87=91?=
 =?UTF-8?q?=E9=A1=8D=E6=AC=84=E3=81=8C=E3=83=A2=E3=83=BC=E3=83=89=E5=88=87?=
 =?UTF-8?q?=E6=9B=BF=E3=81=A7=E4=BD=9C=E3=82=8A=E7=9B=B4=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E7=AD=89=E3=82=92=E7=9B=B4=E3=81=99=20(B-R11d)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

第 6 回レビュー R11b で固定した QR 生成画面の既存の挙動 4 件。(1) プレビュー modal の
onClose が render ごとに変わり dialog に focus が戻っていた → handler を安定化 (open 時の
focus と Escape は従来どおり)。(2) 下部 bar の再描画 effect が初回表示で発火しなかった →
表示状態を依存に加える。(3) 据え置き↔金額指定の切替で金額入力と quick-amount editor が
作り直されていた → 既存 root に hidden を付けて node と入力値を保つ。据え置き → 金額指定の
切替では従来どおり金額欄に focus する (flushSync + ref)。(4) FX の期限切れは注意表示のみの
既存方針を維持 (comment に明記)。支払い URL・EIP-681・receipt の fixture は不変。

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HeizmagJBgL5peL5mQpxkc
---
 components/QrGenerator.tsx                    |   5 +-
 components/qr/QrAmountSection.tsx             | 127 +++++++-------
 components/qr/QrPreviewSection.tsx            |  12 +-
 components/qr/QuickAmountEditor.tsx           |   4 +-
 .../QrGenerator.extraction.test.tsx           | 157 +++++++++++++++---
 tests/components/QrGenerator.test.tsx         |   8 +-
 6 files changed, 224 insertions(+), 89 deletions(-)

diff --git a/components/QrGenerator.tsx b/components/QrGenerator.tsx
index 67cb2a10..f4ffcf24 100644
--- a/components/QrGenerator.tsx
+++ b/components/QrGenerator.tsx
@@ -78,6 +78,8 @@ export function QrGenerator() {
   const [step2Initialized, setStep2Initialized] = useState(false);
   // QR は即時表示せず「QRコードを表示する」ボタン → 全画面モーダルで提示。
   const [qrModalOpen, setQrModalOpen] = useState(false);
+  // onClose は modal の focus effect の依存。残高更新や入力で再 focus させない。
+  const closeQrModal = useCallback(() => setQrModalOpen(false), []);
   // 初回に QR モーダルを開いた「ピークモーメント」を latch。以降 A2HS hint を出す
   // (毎日この QR を使う店主に、ホーム画面への追加を提案する)。閉じても latch は保持。
   const [hasOpenedQr, setHasOpenedQr] = useState(false);
@@ -231,6 +233,7 @@ export function QrGenerator() {
       // 旧 QR との互換性を最大化するため token=usdc 時のみ出力する。
       crossChain: settings.token === 'usdc' ? crossChainAllowed(settings.chain, settings.crossChain) : undefined,
       // convert 適用時のみ、期限と顧客への文脈表示 (元価格 + レート) を URL に乗せる。
+      // 期限は画面上の目安。期限切れでも QR / exp は保持し、明示的な再計算で更新する。
       expiresAt: convert?.expiresAt,
       priceRefAmount: convert?.anchorAmount,
       fxRate: convert?.fxRate,
@@ -594,7 +597,7 @@ export function QrGenerator() {
       {payUrl && (
         <QrPreviewModal
           open={qrModalOpen}
-          onClose={() => setQrModalOpen(false)}
+          onClose={closeQrModal}
           labels={{
             title: t('qrModalTitle'),
             close: t('qrModalClose'),
diff --git a/components/qr/QrAmountSection.tsx b/components/qr/QrAmountSection.tsx
index e738ffd8..0d9c8d76 100644
--- a/components/qr/QrAmountSection.tsx
+++ b/components/qr/QrAmountSection.tsx
@@ -2,10 +2,12 @@
 
 import {
   useMemo,
+  useRef,
   type ComponentProps,
   type Dispatch,
   type SetStateAction,
 } from 'react';
+import { flushSync } from 'react-dom';
 import { useTranslations } from 'next-intl';
 import { Coins } from 'lucide-react';
 import { RecoverFeeNotice } from '../RecoverFeeNotice';
@@ -82,6 +84,7 @@ export function QrAmountSection({
   recoverGasMode: GasMode;
 }) {
   const t = useTranslations('QrGenerator');
+  const amountInputRef = useRef<HTMLInputElement>(null);
 
   // クイック金額は token (JPYC=円 / USDC=ドル) ごとに独立。エディタ・適用とも
   // 現在の token のサブリストだけを操作する。
@@ -164,7 +167,13 @@ export function QrAmountSection({
                   key={m}
                   type="button"
                   onClick={() => {
-                    setMode(m as Mode);
+                    if (m === 'amount' && mode === 'static') {
+                      // iOS のキーボードを開けるよう、表示を反映してからタップ中に focus する。
+                      flushSync(() => setMode('amount'));
+                      amountInputRef.current?.focus();
+                    } else {
+                      setMode(m);
+                    }
                     resetConvert();
                   }}
                   className={`flex-1 rounded-md px-3 py-1.5 text-sm font-medium transition ${
@@ -177,59 +186,60 @@ export function QrAmountSection({
                 </button>
               ))}
             </div>
-            {mode === 'amount' ? (
-              <div className="space-y-3">
-                {/* 金額ヒーロー: 入力欄を「表示器」化して数字を主役に。通貨記号は控えめな
-                    接尾、その真下に参考円 (USDC のみ・JPYC は ¥ ペッグで冗長ゆえ非表示)。
-                    枠線は container 側に寄せ、focus で brand + 浮き影。 */}
-                <div className="rounded-2xl border-2 border-slate-200 bg-gradient-to-br from-white to-brand/[0.03] px-5 py-4 transition focus-within:border-brand focus-within:shadow-card">
-                  <div className="flex items-baseline gap-2">
-                    <input
-                      type="text"
-                      inputMode="decimal"
-                      value={amount}
-                      onChange={(e) => {
-                        setAmount(
-                          truncateAmount(e.target.value, deployment.decimals),
-                        );
-                        resetConvert();
-                      }}
-                      placeholder={settings.token === 'jpyc' ? '1000' : '10.00'}
-                      aria-label={t('amountLabel', {
-                        symbol: deployment.displaySymbol,
-                      })}
-                      className="min-w-0 flex-1 bg-transparent text-right text-4xl font-bold tabular-nums tracking-tight text-slate-900 placeholder:text-slate-300 focus:outline-none sm:text-5xl"
-                      autoFocus
-                    />
-                    <span className="shrink-0 text-xl font-semibold text-slate-500">
-                      {deployment.displaySymbol}
-                    </span>
-                  </div>
-                  {fiatHint && (
-                    <div className="mt-1 text-right text-sm font-medium text-slate-500">
-                      {fiatHint}
-                    </div>
-                  )}
+            {/* 非表示でも node を保持し、再表示で入力欄を作り直さない。 */}
+            <div className="space-y-3" hidden={mode !== 'amount'}>
+              {/* 金額ヒーロー: 入力欄を「表示器」化して数字を主役に。通貨記号は控えめな
+                  接尾、その真下に参考円 (USDC のみ・JPYC は ¥ ペッグで冗長ゆえ非表示)。
+                  枠線は container 側に寄せ、focus で brand + 浮き影。 */}
+              <div className="rounded-2xl border-2 border-slate-200 bg-gradient-to-br from-white to-brand/[0.03] px-5 py-4 transition focus-within:border-brand focus-within:shadow-card">
+                <div className="flex items-baseline gap-2">
+                  <input
+                    ref={amountInputRef}
+                    type="text"
+                    inputMode="decimal"
+                    value={amount}
+                    onChange={(e) => {
+                      setAmount(
+                        truncateAmount(e.target.value, deployment.decimals),
+                      );
+                      resetConvert();
+                    }}
+                    placeholder={settings.token === 'jpyc' ? '1000' : '10.00'}
+                    aria-label={t('amountLabel', {
+                      symbol: deployment.displaySymbol,
+                    })}
+                    className="min-w-0 flex-1 bg-transparent text-right text-4xl font-bold tabular-nums tracking-tight text-slate-900 placeholder:text-slate-300 focus:outline-none sm:text-5xl"
+                    autoFocus
+                  />
+                  <span className="shrink-0 text-xl font-semibold text-slate-500">
+                    {deployment.displaySymbol}
+                  </span>
                 </div>
-                {activeQuickAmounts.length > 0 && (
-                  <div className="grid grid-cols-2 gap-2 sm:grid-cols-4">
-                    {activeQuickAmounts.map((q) => (
-                      <button
-                        key={q}
-                        type="button"
-                        onClick={() => {
-                          setAmount(q);
-                          resetConvert();
-                        }}
-                        className="rounded-xl border border-slate-200 bg-white px-3 py-2.5 text-sm font-semibold text-slate-700 transition hover:-translate-y-0.5 hover:border-brand hover:text-brand-dark hover:shadow-card active:translate-y-0"
-                      >
-                        {q} {deployment.displaySymbol}
-                      </button>
-                    ))}
+                {fiatHint && (
+                  <div className="mt-1 text-right text-sm font-medium text-slate-500">
+                    {fiatHint}
                   </div>
                 )}
               </div>
-            ) : (
+              {activeQuickAmounts.length > 0 && (
+                <div className="grid grid-cols-2 gap-2 sm:grid-cols-4">
+                  {activeQuickAmounts.map((q) => (
+                    <button
+                      key={q}
+                      type="button"
+                      onClick={() => {
+                        setAmount(q);
+                        resetConvert();
+                      }}
+                      className="rounded-xl border border-slate-200 bg-white px-3 py-2.5 text-sm font-semibold text-slate-700 transition hover:-translate-y-0.5 hover:border-brand hover:text-brand-dark hover:shadow-card active:translate-y-0"
+                    >
+                      {q} {deployment.displaySymbol}
+                    </button>
+                  ))}
+                </div>
+              )}
+            </div>
+            {mode === 'static' && (
               <p className="rounded-lg bg-slate-50 px-3 py-3 text-sm text-slate-500">
                 {t('staticHint')}
               </p>
@@ -239,15 +249,14 @@ export function QrAmountSection({
 
         {/* クイック金額の編集 (任意・token ごと独立)。金額入力の近くで設定できる
             よう高度な設定から①へ移設。 */}
-        {mode === 'amount' && (
-          <QuickAmountEditor
-            items={tokenQuickAmounts}
-            max={QUICK_AMOUNT_MAX}
-            onUpdate={updateQuickAmount}
-            onAdd={addQuickAmount}
-            onRemove={removeQuickAmount}
-          />
-        )}
+        <QuickAmountEditor
+          hidden={mode !== 'amount'}
+          items={tokenQuickAmounts}
+          max={QUICK_AMOUNT_MAX}
+          onUpdate={updateQuickAmount}
+          onAdd={addQuickAmount}
+          onRemove={removeQuickAmount}
+        />
 
         <ConvertPanel
           canShowConvert={canShowConvert}
diff --git a/components/qr/QrPreviewSection.tsx b/components/qr/QrPreviewSection.tsx
index 35c457be..d25aacae 100644
--- a/components/qr/QrPreviewSection.tsx
+++ b/components/qr/QrPreviewSection.tsx
@@ -102,8 +102,8 @@ export function QrPreviewSection({
   );
 }
 
-// モバイル下部固定 会計バー。payUrl が無い間も mount したまま null を返す — 再描画 effect を
-// バーの出現で発火させず、従来どおり金額 / モード / 通貨記号の変化時だけにするため。
+// モバイル下部固定 会計バー。payUrl が無い間は null。URL の内容だけの変更では
+// 再描画を促さず、バーの出現と表示金額 / モード / 通貨記号の変更に追従する。
 export function QrMobileBar({
   payUrl,
   amount,
@@ -123,9 +123,11 @@ export function QrMobileBar({
 }) {
   const t = useTranslations('QrGenerator');
   const bottomBarRef = useRef<HTMLDivElement>(null);
+  const visible = Boolean(payUrl);
   // WebKit (モバイル Safari・SNS アプリ内ブラウザ) では position:sticky な下部バーの子テキストを
   // JS で書き換えても合成レイヤーが再ラスタライズされず古い表示が残ることがある (RegisterMode
-  // と同根)。表示金額/通貨/モードが変わるたび transform を 1 フレーム入れて再描画を強制する。
+  // と同根)。バーの出現時と表示金額/通貨/モードが変わるたび transform を 1 フレーム
+  // 入れて再描画を強制する (金額を先に入力し、後から受取先が確定する場合も含む)。
   useEffect(() => {
     const el = bottomBarRef.current;
     if (!el) return;
@@ -134,8 +136,8 @@ export function QrMobileBar({
       if (el) el.style.transform = '';
     });
     return () => cancelAnimationFrame(id);
-  }, [amount, mode, deployment.displaySymbol]);
-  if (!payUrl) return null;
+  }, [visible, amount, mode, deployment.displaySymbol]);
+  if (!visible) return null;
   return (
     <div
       ref={bottomBarRef}
diff --git a/components/qr/QuickAmountEditor.tsx b/components/qr/QuickAmountEditor.tsx
index 60b7f33f..17553c34 100644
--- a/components/qr/QuickAmountEditor.tsx
+++ b/components/qr/QuickAmountEditor.tsx
@@ -9,16 +9,18 @@ export function QuickAmountEditor({
   onUpdate,
   onAdd,
   onRemove,
+  hidden,
 }: {
   items: string[];
   max: number;
   onUpdate: (idx: number, value: string) => void;
   onAdd: () => void;
   onRemove: (idx: number) => void;
+  hidden?: boolean;
 }) {
   const t = useTranslations('QrGenerator');
   return (
-    <details className="group rounded-2xl border border-slate-200 bg-white p-4">
+    <details hidden={hidden} className="group rounded-2xl border border-slate-200 bg-white p-4">
       <summary className="flex cursor-pointer list-none items-center justify-between text-sm font-medium text-slate-700">
         <span>{t('quickAmountsLabel')}</span>
         <ChevronRight
diff --git a/tests/components/QrGenerator.extraction.test.tsx b/tests/components/QrGenerator.extraction.test.tsx
index 6b2ae4e8..87e74f28 100644
--- a/tests/components/QrGenerator.extraction.test.tsx
+++ b/tests/components/QrGenerator.extraction.test.tsx
@@ -15,7 +15,8 @@ import en from '@/messages/en.json';
 //   - モーダルの再表示とキャッシュ (コピー状態・前回 QR の保存・着金監視の再開)
 //   - FX の期限が子の mount/unmount をまたいで保たれること
 //   - SVG/PNG 保存が「今の」主 QR の ref を読むこと・印刷
-//   - 下部バーの WebKit 再描画 effect の発火条件 (金額/モード/通貨記号の変化時だけ)
+//   - 下部バーの WebKit 再描画 effect の発火条件 (B-R11d: 出現時も含める)
+// B-R11d の意図した差分: modal の focus 保持・バー出現時の再描画・モード切替時の入力保持。
 
 const mocks = vi.hoisted(() => ({
   balance: undefined as bigint | undefined,
@@ -325,6 +326,8 @@ describe('R11b: generated payment URL fixtures', () => {
 // 変更の意図と一致することを確かめてから、その文字列を下の該当キーへ写す。抽出・分割の
 // 差分に合わせて書き換えてはならない (Phase 6 原則 2 — その場合は抽出前の code で記録する)。
 // lucide-react / qrcode.react の更新だけで digest が変わるなら除外 (withoutSvgInternals) の漏れ。
+// B-R11d: fresh-ja/en の static/modal だけ amount/full を更新。金額欄・エディタが
+// hidden で残るため。amount モードの DOM と、それ以外の節の digest は不変。
 const DOM_BASELINE: Record<string, string> = {
   'fresh-ja/empty':
     'shape=2/2/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=58f78ef36af2 receiver=e7e8e741048e accounting=1ae21b00fd1a settings=52f60fef0496 preview=df6fdaa1b2ab full=87e6a26fdc72',
@@ -335,9 +338,9 @@ const DOM_BASELINE: Record<string, string> = {
   'fresh-ja/advanced':
     'shape=2/3/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=f11c9c908a3d receiver=53e63a799c4c accounting=1ae21b00fd1a settings=248c7149dc79 preview=a2659703e1e8 bar=59ab00522b30 full=da0a17195a81',
   'fresh-ja/static':
-    'shape=2/3/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=05b177225a49 receiver=53e63a799c4c accounting=1ae21b00fd1a settings=248c7149dc79 preview=a2659703e1e8 bar=de07dcf3f38f full=af9234402c11',
+    'shape=2/3/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=6535b1cbe2da receiver=53e63a799c4c accounting=1ae21b00fd1a settings=248c7149dc79 preview=a2659703e1e8 bar=de07dcf3f38f full=49b178e99ae5',
   'fresh-ja/modal':
-    'shape=2/4/5/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=05b177225a49 receiver=53e63a799c4c accounting=1ae21b00fd1a settings=248c7149dc79 pwa=f0506b8ca563 preview=a2659703e1e8 modal=bddf69eea475 bar=de07dcf3f38f full=17c26552dcff',
+    'shape=2/4/5/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=6535b1cbe2da receiver=53e63a799c4c accounting=1ae21b00fd1a settings=248c7149dc79 pwa=f0506b8ca563 preview=a2659703e1e8 modal=bddf69eea475 bar=de07dcf3f38f full=e50b5a7ab4d1',
   'fresh-en/empty':
     'shape=2/2/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=63f2f3856490 receiver=df2279b703b8 accounting=74ed35d7215a settings=16c64a10b7aa preview=fe779a049a06 full=94d3a55cfcb0',
   'fresh-en/receiver-typed':
@@ -347,9 +350,9 @@ const DOM_BASELINE: Record<string, string> = {
   'fresh-en/advanced':
     'shape=2/3/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=225a60671bb5 receiver=fedfcd16f726 accounting=74ed35d7215a settings=8d52fa6c9d78 preview=af1a40c48a66 bar=8fd7054ec7dc full=2ae0731b41e4',
   'fresh-en/static':
-    'shape=2/3/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=b8b03420b536 receiver=fedfcd16f726 accounting=74ed35d7215a settings=8d52fa6c9d78 preview=af1a40c48a66 bar=7af51957c9d0 full=a74f28eaea86',
+    'shape=2/3/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=0967e76f4762 receiver=fedfcd16f726 accounting=74ed35d7215a settings=8d52fa6c9d78 preview=af1a40c48a66 bar=7af51957c9d0 full=d6f784e55d7a',
   'fresh-en/modal':
-    'shape=2/4/5/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=b8b03420b536 receiver=fedfcd16f726 accounting=74ed35d7215a settings=8d52fa6c9d78 pwa=3e04971c2b53 preview=af1a40c48a66 modal=1f8b3ee8e853 bar=7af51957c9d0 full=c357d7c934b9',
+    'shape=2/4/5/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=0967e76f4762 receiver=fedfcd16f726 accounting=74ed35d7215a settings=8d52fa6c9d78 pwa=3e04971c2b53 preview=af1a40c48a66 modal=1f8b3ee8e853 bar=7af51957c9d0 full=3143a82eacfe',
   'seeded/collapsed':
     'shape=2/2/4/0 offline=f77ebeefe1a1 grid=8c2858128be8 left=2b7c226170e0 amount=58f78ef36af2 receiver=a40a7c4b7637 accounting=1ae21b00fd1a settings=52f60fef0496 preview=ef5f97440853 full=16d1e09dc74d',
   'seeded/step2-open':
@@ -581,7 +584,7 @@ const SCENARIOS: Record<string, { locale: Locale; run: (snap: Snap) => Promise<v
   },
 };
 
-describe('R11b: section DOM is unchanged', () => {
+describe('R11b: section DOM with B-R11d hidden static controls', () => {
   it.each(Object.keys(SCENARIOS))('%s', async (key) => {
     const scenario = SCENARIOS[key];
     locale = scenario.locale;
@@ -661,27 +664,48 @@ describe('R11b: no remount when sections become child components', () => {
     await settle();
     expect(requery()).toEqual(nodes);
     expect([quickDetails.open, accountingDetails.open]).toEqual([true, true]);
-    // 据え置き → 金額指定は従来どおり金額欄を作り直し (autoFocus で再 focus)、
-    // 金額指定時だけ出るクイック金額エディタも作り直す (開閉は閉じに戻る)。会計は保持。
+    // B-R11d S1: 据え置き中も金額欄とエディタを保持。ユーザーが金額指定へ
+    // 戻した時だけ同じ入力 node に focus し、クイック金額の開閉も保持する。
     // モード切替ボタン自体は ① の節ごと作り直されない (同じ node のまま)。
     fireEvent.click(screen.getByRole('button', { name: labels().modeStatic }));
     await settle();
-    expect(screen.queryByText(labels().quickAmountsLabel)).toBeNull();
+    expect(amountEl).toBeInTheDocument();
+    expect(amountEl).not.toBeVisible();
+    expect(quickDetails).toBeInTheDocument();
+    expect(quickDetails).not.toBeVisible();
+    expect(within(quickDetails).queryAllByRole('textbox')).toHaveLength(0);
     expect(screen.getByRole('button', { name: labels().modeStatic })).toBe(nodes.modeStatic);
     expect(screen.getByRole('button', { name: labels().modeAmount })).toBe(nodes.modeAmount);
-    fireEvent.click(screen.getByRole('button', { name: labels().modeAmount }));
+    const focusAmount = amountEl.focus.bind(amountEl);
+    const focusSpy = vi.spyOn(amountEl, 'focus').mockImplementation(() => {
+      // jsdom は hidden な入力にも focus できるので、実ブラウザで必要な表示順も検証する。
+      expect(amountEl).toBeVisible();
+      focusAmount();
+    });
+    nodes.modeAmount.focus();
+    fireEvent.click(nodes.modeAmount);
     await settle();
     expect(screen.getByRole('button', { name: labels().modeAmount })).toBe(nodes.modeAmount);
     expect(screen.getByRole('button', { name: labels().modeStatic })).toBe(nodes.modeStatic);
-    const remounted = amountInput();
-    expect(remounted).not.toBe(amountEl);
-    expect(document.activeElement).toBe(remounted);
-    expect(detailsOf(labels().quickAmountsLabel)).not.toBe(quickDetails);
-    expect(detailsOf(labels().quickAmountsLabel).open).toBe(false);
+    expect(amountInput()).toBe(amountEl);
+    expect(amountEl).toBeVisible();
+    expect(amountEl).toHaveValue('20');
+    expect(focusSpy).toHaveBeenCalledOnce();
+    expect(document.activeElement).toBe(amountEl);
+    expect(detailsOf(labels().quickAmountsLabel)).toBe(quickDetails);
+    expect(quickDetails).toBeVisible();
+    expect(quickDetails.open).toBe(true);
+    expect(within(quickDetails).getAllByRole('textbox')[0]).toBe(nodes.quickInput);
+    expect(nodes.quickInput).toHaveValue('7');
     expect(detailsOf(labels().accountingFieldsTitle)).toBe(accountingDetails);
     expect(accountingDetails.open).toBe(true);
     expect(advancedToggle()).toBe(nodes.advanced);
     expect(screen.getByRole('checkbox')).toBe(nodes.crossChain);
+    focusSpy.mockClear();
+    nodes.modeAmount.focus();
+    fireEvent.click(nodes.modeAmount);
+    expect(focusSpy).not.toHaveBeenCalled(); // 同じモードの再選択では focus を移さない。
+    expect(document.activeElement).toBe(nodes.modeAmount);
   });
 
   it('keeps the Step 2 and advanced-settings open state owned by the generator across modal and mode changes', async () => {
@@ -702,23 +726,58 @@ describe('R11b: no remount when sections become child components', () => {
   });
 });
 
-describe('R11b: mobile bar repaint effect', () => {
-  it('flashes translateZ(0) only when amount, mode or the display symbol changes', async () => {
+describe('B-R11d: retained amount in static mode', () => {
+  it('omits a previously typed amount and EIP-681 in static mode, restoring both when switched back', async () => {
+    seed({ token: 'usdc', chain: 'base', payMode: 'standard' });
     renderQr();
     await settle();
+    amount('12.5');
+    const input = amountInput();
+    const amountDialog = openQr();
+    const amountUrl = BASE_URL + '&token=usdc&amount=12.5&mode=standard';
+    expect(displayedUrl()).toBe(amountUrl);
+    const eip681 = within(amountDialog).getByText(/^ethereum:/).textContent;
+    expect(within(amountDialog).getByText(labels().eip681Title)).toBeInTheDocument();
+    closeQr();
+
+    fireEvent.click(screen.getByRole('button', { name: labels().modeStatic }));
+    expect(input).toHaveValue('12.5');
+    expect(input).not.toBeVisible();
+    const staticDialog = openQr();
+    expect(displayedUrl()).toBe(BASE_URL + '&token=usdc&mode=standard');
+    expect(within(staticDialog).queryByText(labels().eip681Title)).toBeNull();
+    expect(within(staticDialog).queryByText(/^ethereum:/)).toBeNull();
+    closeQr();
+
+    fireEvent.click(screen.getByRole('button', { name: labels().modeAmount }));
+    expect(amountInput()).toBe(input);
+    const restoredDialog = openQr();
+    expect(displayedUrl()).toBe(amountUrl);
+    expect(within(restoredDialog).getByText(labels().eip681Title)).toBeInTheDocument();
+    expect(within(restoredDialog).getByText(/^ethereum:/).textContent).toBe(eip681);
+  });
+});
+
+describe('B-R11d: mobile bar repaint effect', () => {
+  it('repaints on appearance and amount/mode/symbol changes, cancelling stale frames on hide or unmount', async () => {
+    const view = renderQr();
+    await settle();
     amount('1000');
     await settle();
     // 受取先が未設定の間はバーが無い (effect は ref=null で素通り)。
     expect(mobileBar()).toBeNull();
     fireEvent.change(receiverInput(), { target: { value: RECEIVER } });
     await settle();
-    // バーの出現自体は effect の依存 (金額/モード/記号) を変えないので style に触れない。
+    // 金額が先・受取先が後でも、バーの初回表示で WebKit の再描画を促す。
     const bar = mobileBar()!;
-    expect(bar.getAttribute('style')).toBeNull();
-    expect(frames.size).toBe(0);
+    expect(bar.style.transform).toBe('translateZ(0)');
+    expect(frames.size).toBe(1);
+    flushFrames();
+    expect(bar.style.transform).toBe('');
     fireEvent.change(screen.getByPlaceholderText(labels().storeNamePlaceholder), { target: { value: '店' } });
     await settle();
-    expect(bar.getAttribute('style')).toBeNull();
+    expect(bar.style.transform).toBe('');
+    expect(frames.size).toBe(0); // URL の変更だけでは再描画しない。
     amount('1200');
     expect(bar.style.transform).toBe('translateZ(0)');
     amount('1300');
@@ -737,6 +796,62 @@ describe('R11b: mobile bar repaint effect', () => {
     expect(bar.style.transform).toBe('translateZ(0)');
     flushFrames();
     expect(bar.style.transform).toBe('');
+    amount('1400');
+    expect(frames.size).toBe(1);
+    fireEvent.change(receiverInput(), { target: { value: '' } });
+    expect(mobileBar()).toBeNull();
+    expect(frames.size).toBe(0);
+    fireEvent.change(receiverInput(), { target: { value: RECEIVER } });
+    const reappeared = mobileBar()!;
+    expect(reappeared).not.toBe(bar);
+    expect(reappeared.style.transform).toBe('translateZ(0)');
+    expect(frames.size).toBe(1);
+    view.unmount();
+    expect(frames.size).toBe(0);
+  });
+});
+
+describe('B-R11d: modal focus survives parent updates', () => {
+  it('keeps focus during balance polling and background input, and still focuses on reopen and closes with Escape', async () => {
+    seed();
+    const view = renderQr();
+    await settle();
+    amount('750');
+    const dialog = openQr();
+    expect(dialog).toHaveFocus();
+    const close = within(dialog).getByRole('button', { name: labels().qrModalClose });
+    close.focus();
+    mocks.balance = 10n ** 21n;
+    view.rerender(<QrGenerator />);
+    expect(close).toHaveFocus();
+    mocks.balance += 750n * 10n ** 18n;
+    view.rerender(<QrGenerator />);
+    expect(within(dialog).getByRole('status').textContent).toContain('残高の増加');
+    expect(close).toHaveFocus();
+    const input = amountInput();
+    input.focus();
+    amount('950');
+    expect(input).toHaveFocus();
+    expect(displayedUrl()).toBe(BASE_URL + '&token=jpyc&amount=950');
+    fireEvent.keyDown(window, { key: 'Escape' });
+    expect(screen.queryByRole('dialog')).toBeNull();
+    expect(openQr()).toHaveFocus();
+    closeQr();
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it('keeps the modal action focused while the FX countdown re-renders the generator', async () => {
+    seed();
+    renderQr();
+    await settle();
+    amount('1000');
+    fireEvent.click(screen.getByRole('button', { name: labels().convertButton.replace('{symbol}', 'USDC') }));
+    const dialog = openQr();
+    const close = within(dialog).getByRole('button', { name: labels().qrModalClose });
+    close.focus();
+    await act(async () => { await vi.advanceTimersByTimeAsync(1000); });
+    expect(screen.getByText(/残り 2:59/)).toBeInTheDocument();
+    expect(close).toHaveFocus();
   });
 });
 
diff --git a/tests/components/QrGenerator.test.tsx b/tests/components/QrGenerator.test.tsx
index 701247ba..a64b5c55 100644
--- a/tests/components/QrGenerator.test.tsx
+++ b/tests/components/QrGenerator.test.tsx
@@ -381,15 +381,19 @@ describe('QrGenerator', () => {
       );
     });
 
-    it('据え置きモードへ切替: 金額入力が消えてもメッセージが出る', async () => {
+    it('据え置きモードへ切替: JPYC の金額入力が非表示になりメッセージが出る', async () => {
       const user = userEvent.setup();
       render(<QrGenerator />);
       await waitFor(() => screen.getByPlaceholderText(/0x\.\.\./));
       await user.type(screen.getByPlaceholderText(/0x\.\.\./), VALID);
 
+      const input = screen.getByPlaceholderText('1000');
+      expect(input).toBeVisible();
       await user.click(screen.getByRole('button', { name: /据え置き/ }));
 
-      expect(screen.queryByPlaceholderText('10.00')).toBeNull();
+      expect(input).toBeInTheDocument();
+      expect(input).not.toBeVisible();
+      expect(screen.queryByRole('textbox', { name: /請求金額/ })).toBeNull();
       expect(
         screen.getByText(/据え置き QR では金額を顧客が入力/),
       ).toBeInTheDocument();